Merge branch 'junit-team:main' into file_source_reuse

Author: lslonina

.github/actions/run-gradle/action.yml

@@ -15,7 +15,7 @@ runs:
       id: setup-gradle-jdk
       with:
         distribution: temurin
-        java-version: 21
+        java-version: 24
         check-latest: true
     - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
       with:

.github/workflows/cross-version.yml

@@ -22,8 +22,6 @@ jobs:
       fail-fast: false
       matrix:
         jdk:
-        - version: 24
-          type: ga
         - version: 25
           type: ea
     name: "OpenJDK ${{ matrix.jdk.version }} (${{ matrix.jdk.release || matrix.jdk.type }})"

.github/workflows/gradle-dependency-submission.yml

@@ -22,7 +22,7 @@ jobs:
       uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         distribution: temurin
-        java-version: 21
+        java-version: 24
         check-latest: true
     - name: Generate and submit dependency graph
       uses: gradle/actions/dependency-submission@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0

.github/workflows/main.yml

@@ -29,7 +29,7 @@ jobs:
       with:
         distribution: graalvm-community
         version: 'latest'
-        java-version: '21'
+        java-version: '24'
         github-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Build
       uses: ./.github/actions/main-build

.github/workflows/release.yml

@@ -87,7 +87,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:
-          java-version: 21
+          java-version: 24
           distribution: temurin
       - uses: sbt/setup-sbt@69a46ab4acd4316aa16e68d91a9249a98d7e78d5 # v1.1.8
       - name: Update JUnit dependencies in samples
@@ -245,7 +245,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:
-          java-version: 21
+          java-version: 24
           distribution: temurin
       - uses: sbt/setup-sbt@69a46ab4acd4316aa16e68d91a9249a98d7e78d5 # v1.1.8
       - name: Update JUnit dependencies in samples

README.md

@@ -70,7 +70,7 @@ task outputs from previous CI builds.
 
 ## Building from Source
 
-You need [JDK 21] to build JUnit. [Gradle toolchains] are used to detect and
+You need [JDK 24] to build JUnit. [Gradle toolchains] are used to detect and
 potentially download additional JDKs for compilation and test execution.
 
 All modules can be _built_ and _tested_ with the [Gradle Wrapper] using the following command:
@@ -100,7 +100,7 @@ of the JUnit Platform, JUnit Jupiter, and JUnit Vintage.
 [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 21]: https://javaalmanac.io/jdk/21/
+[JDK 24]: https://javaalmanac.io/jdk/24/
 [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

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

@@ -42,6 +42,8 @@ on GitHub.
   in their enclosing class. This undesired change in behavior has now been reverted so
   that tests in `@Nested` test classes are always executed _after_ tests in enclosing test
   classes again.
+* Fix support for `AnnotationBasedArgumentsProvider` implementations that override the
+  deprecated `provideArguments(ExtensionContext, Annotation)` method.
 
 [[release-notes-5.13.1-junit-jupiter-deprecations-and-breaking-changes]]
 ==== Deprecations and Breaking Changes

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

@@ -76,6 +76,11 @@ repository on GitHub.
   property has been removed. JUnit now always adheres to standard Java semantics regarding
   whether a given field or method is visible or overridden according to the rules of the
   Java language.
+* The type bounds of the following methods have been changed to be more flexible and allow
+  nullable and non-nullable types:
+  - `ConfigurationParameters.get(String, Function)`
+  - `NamespacedHierarchicalStore.getOrComputeIfAbsent(N, K, Function)`
+  - `NamespacedHierarchicalStore.getOrComputeIfAbsent(N, K, Function, Class)`
 
 [[release-notes-6.0.0-M1-junit-platform-new-features-and-improvements]]
 ==== New Features and Improvements
@@ -112,6 +117,11 @@ repository on GitHub.
   `callsInPlace(executable, AT_MOST_ONCE)` which might result in compilation errors.
 * The `junit-jupiter-migrationsupport` artifact and its contained classes are now
   deprecated and will be removed in the next major version.
+* The type bounds of the following methods have been changed to be more flexible and allow
+  nullable and non-nullable types:
+  - `ExtensionContext.getConfigurationParameter(String, Function)`
+  - `ExtensionContext.getOrComputeIfAbsent(K, Function)`
+  - `ExtensionContext.getOrComputeIfAbsent(K, Function, Class)`
 
 [[release-notes-6.0.0-M1-junit-jupiter-new-features-and-improvements]]
 ==== New Features and Improvements

documentation/src/javadoc/junit-stylesheet.css

@@ -30,6 +30,9 @@
     /* Text colors for links */
     --link-color: #dc524a;
     --link-color-active: #b62b23;
+    /* Table of contents */
+    --toc-background-color: var(--section-background-color);
+    --toc-link-color: #000;
     /* Snippet colors */
     --snippet-background-color: #ebecee;
     --snippet-text-color: var(--block-text-color);
@@ -39,10 +42,6 @@
     --table-border-color: #999;
     /* Highlight color for active search tag target */
     --search-tag-highlight-color: #ffff00;
-    /* Adjustments for icon and active background colors of copy-to-clipboard buttons */
-    --copy-button-background-color-active: rgba(168, 168, 168, 0.3);
-    /* Colors for invalid tag notifications */
-    --invalid-tag-background-color: #ffe6e6;
 }
 
 .title {

documentation/src/test/java/example/FirstCustomEngine.java

@@ -48,6 +48,9 @@ public TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId
 		return new EngineDescriptor(uniqueId, "First Custom Test Engine");
 	}
 
+	//end::user_guide[]
+	@SuppressWarnings("NullAway")
+	//tag::user_guide[]
 	@Override
 	public void execute(ExecutionRequest request) {
 		request.getEngineExecutionListener()