Merge branch 'main' into rien/prune-stacktrace-assertion-builder

mpkorstanje · web-flow · commit 3a915615afc9 · 2025-11-21T16:48:43.000+01:00
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -41,11 +41,11 @@ jobs:
             build-mode: none
     steps:
     - name: Check out repository
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       with:
         persist-credentials: false
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
+      uses: github/codeql-action/init@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
@@ -60,6 +60,6 @@ jobs:
           -Dscan.tag.CodeQL \
           classes
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
+      uses: github/codeql-action/analyze@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           fetch-depth: 1
           persist-credentials: false
@@ -88,7 +88,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           fetch-depth: 1
           persist-credentials: false
diff --git a/.github/workflows/gradle-dependency-submission.yml b/.github/workflows/gradle-dependency-submission.yml
@@ -18,7 +18,7 @@ jobs:
       contents: write
     steps:
     - name: Check out repository
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       with:
         fetch-depth: 1
         persist-credentials: false
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Check out repository
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       with:
         fetch-depth: 1
         persist-credentials: false
@@ -54,7 +54,7 @@ jobs:
     runs-on: windows-latest
     steps:
     - name: Check out repository
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       with:
         fetch-depth: 1
         persist-credentials: false
@@ -67,7 +67,7 @@ jobs:
     runs-on: macos-latest
     steps:
     - name: Check out repository
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       with:
         fetch-depth: 1
         persist-credentials: false
@@ -86,7 +86,7 @@ jobs:
     if: github.event_name == 'push' && github.repository == 'junit-team/junit-framework' && (startsWith(github.ref, 'refs/heads/releases/') || github.ref == 'refs/heads/main')
     steps:
     - name: Check out repository
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       with:
         fetch-depth: 1
         persist-credentials: false
@@ -114,7 +114,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Check out repository
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       with:
         fetch-depth: 1
         persist-credentials: false
diff --git a/.github/workflows/ossf-scorecard.yml b/.github/workflows/ossf-scorecard.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 
@@ -57,6 +57,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
+        uses: github/codeql-action/upload-sarif@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -33,7 +33,7 @@ jobs:
       id-token: write # required for build provenance attestation
     steps:
       - name: Check out repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           fetch-depth: 1
           ref: "refs/tags/${{ env.RELEASE_TAG }}"
@@ -74,14 +74,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           fetch-depth: 1
           ref: "refs/tags/${{ env.RELEASE_TAG }}"
           path: junit-framework
           persist-credentials: false
       - name: Check out examples repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           repository: ${{ github.repository_owner }}/junit-examples
           token: ${{ secrets.JUNIT_BUILDS_GITHUB_TOKEN_EXAMPLES_REPO }}
@@ -118,7 +118,7 @@ jobs:
       issues: write
     steps:
       - name: Check out repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           fetch-depth: 1
           persist-credentials: false
@@ -137,7 +137,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           fetch-depth: 1
           ref: "refs/tags/${{ env.RELEASE_TAG }}"
@@ -160,7 +160,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           fetch-depth: 1
           ref: "refs/tags/${{ env.RELEASE_TAG }}"
@@ -218,7 +218,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out examples repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           repository: ${{ github.repository_owner }}/junit-examples
           token: ${{ secrets.JUNIT_BUILDS_GITHUB_TOKEN_EXAMPLES_REPO }}
@@ -262,7 +262,7 @@ jobs:
       contents: write
     steps:
       - name: Check out repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           fetch-depth: 1
           persist-credentials: false
diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Check out repository
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       with:
         fetch-depth: 1
         persist-credentials: false
diff --git a/.github/workflows/zizmor-analysis.yml b/.github/workflows/zizmor-analysis.yml
@@ -21,7 +21,7 @@ jobs:
       security-events: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-6.1.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-6.1.0-M1.adoc
@@ -49,7 +49,8 @@ repository on GitHub.
 ==== New Features and Improvements
 
 * Introduce new module `org.junit.start` for writing and running tests. It simplifies
-  using JUnit in compact source files together with a single module import statement:
+  using JUnit in compact source files together with a single `module import` statement.
+  Find an example at the <<../user-guide/#running-tests-source-launcher, User Guide>>.
 * Introduce new `dynamicTest(Consumer<? super Configuration>)` factory method for dynamic
   tests. It allows configuring the `ExecutionMode` of the dynamic test in addition to its
   display name, test source URI, and executable.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -110,4 +110,4 @@ kotlin = { id = "org.jetbrains.kotlin.jvm", version = "2.2.21" }
 nullaway = { id = "net.ltgt.nullaway", version = "2.3.0" }
 plantuml = { id = "io.freefair.plantuml", version = "9.1.0" }
 shadow = { id = "com.gradleup.shadow", version = "9.2.2" }
-spotless = { id = "com.diffplug.spotless", version = "8.0.0" }
+spotless = { id = "com.diffplug.spotless", version = "8.1.0" }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassTemplate.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassTemplate.java
@@ -20,32 +20,25 @@
 import java.lang.annotation.Target;
 
 import org.apiguardian.api.API;
-import org.junit.jupiter.api.extension.AfterClassTemplateInvocationCallback;
-import org.junit.jupiter.api.extension.BeforeClassTemplateInvocationCallback;
-import org.junit.jupiter.api.extension.ClassTemplateInvocationContext;
-import org.junit.jupiter.api.extension.ClassTemplateInvocationContextProvider;
 import org.junit.platform.commons.annotation.Testable;
 
 /**
  * {@code @ClassTemplate} is used to signal that the annotated class is a
  * <em>class template</em>.
  *
  * <p>In contrast to regular test classes, a class template is not directly
- * a test class but rather a template for a set of test cases. As such, it is
+ * a test class but rather a template for a set of test classes. As such, it is
  * designed to be invoked multiple times depending on the number of {@linkplain
- * ClassTemplateInvocationContext invocation
- * contexts} returned by the registered {@linkplain
- * ClassTemplateInvocationContextProvider
- * providers}. Must be used together with at least one provider. Otherwise,
- * execution will fail.
+ * org.junit.jupiter.api.extension.ClassTemplateInvocationContext invocation contexts}
+ * returned by the registered {@linkplain
+ * org.junit.jupiter.api.extension.ClassTemplateInvocationContextProvider providers}.
+ * Must be used together with at least one provider. Otherwise, execution will fail.
  *
- * <p>Each invocation of a class template method behaves like the execution
- * of a regular test class with full support for the same lifecycle callbacks
- * and extensions.
+ * <p>Each invocation of a class template behaves like the execution of a regular
+ * test class with full support for the same lifecycle callbacks and extensions.
  *
- * <p>{@code @ClassTemplate} may be combined with {@link Nested @Nested} and
- * a class template may contain regular nested test classes or nested
- * class templates.
+ * <p>{@code @ClassTemplate} may be combined with {@link Nested @Nested}, and a
+ * class template may contain regular nested test classes or nested class templates.
  *
  * <p>{@code @ClassTemplate} may also be used as a meta-annotation in order
  * to create a custom <em>composed annotation</em> that inherits the semantics
@@ -56,11 +49,11 @@
  * <p>This annotation is inherited by subclasses.
  *
  * @since 5.13
- * @see TestTemplate
- * @see ClassTemplateInvocationContext
- * @see ClassTemplateInvocationContextProvider
- * @see BeforeClassTemplateInvocationCallback
- * @see AfterClassTemplateInvocationCallback
+ * @see TestTemplate @TestTemplate
+ * @see org.junit.jupiter.api.extension.ClassTemplateInvocationContext ClassTemplateInvocationContext
+ * @see org.junit.jupiter.api.extension.ClassTemplateInvocationContextProvider ClassTemplateInvocationContextProvider
+ * @see org.junit.jupiter.api.extension.BeforeClassTemplateInvocationCallback BeforeClassTemplateInvocationCallback
+ * @see org.junit.jupiter.api.extension.AfterClassTemplateInvocationCallback AfterClassTemplateInvocationCallback
  */
 @Target({ ElementType.ANNOTATION_TYPE, ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterClassTemplateInvocationCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterClassTemplateInvocationCallback.java
@@ -18,7 +18,7 @@
 /**
  * {@code AfterClassTemplateInvocationCallback} defines the API for
  * {@link Extension Extensions} that wish to provide additional behavior
- * <strong>once</strong> before each invocation of a
+ * <strong>once</strong> after each invocation of a
  * {@link ClassTemplate @ClassTemplate}.
  *
  * <p>Concrete implementations often implement
@@ -34,7 +34,7 @@
  * <p>JUnit Jupiter guarantees <em>wrapping behavior</em> for multiple
  * registered extensions that implement lifecycle callbacks such as
  * {@link BeforeAllCallback}, {@link AfterAllCallback},
- * {@link AfterClassTemplateInvocationCallback},
+ * {@link BeforeClassTemplateInvocationCallback},
  * {@link AfterClassTemplateInvocationCallback}, {@link BeforeEachCallback},
  * {@link AfterEachCallback}, {@link BeforeTestExecutionCallback}, and
  * {@link AfterTestExecutionCallback}.
@@ -64,7 +64,7 @@
 public interface AfterClassTemplateInvocationCallback extends Extension {
 
 	/**
-	 * Callback that is invoked <em>after</em> each invocation of a container
+	 * Callback that is invoked <em>after</em> each invocation of a class
 	 * template.
 	 *
 	 * @param context the current extension context; never {@code null}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeClassTemplateInvocationCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeClassTemplateInvocationCallback.java
@@ -64,7 +64,7 @@
 public interface BeforeClassTemplateInvocationCallback extends Extension {
 
 	/**
-	 * Callback that is invoked <em>before</em> each invocation of a container
+	 * Callback that is invoked <em>before</em> each invocation of a class
 	 * template.
 	 *
 	 * @param context the current extension context; never {@code null}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ClassTemplateInvocationContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ClassTemplateInvocationContext.java
@@ -22,8 +22,7 @@
  * {@code ClassTemplateInvocationContext} represents the <em>context</em> of
  * a single invocation of a {@link ClassTemplate @ClassTemplate}.
  *
- * <p>Each context is provided by a
- * {@link ClassTemplateInvocationContextProvider}.
+ * <p>Each context is provided by a {@link ClassTemplateInvocationContextProvider}.
  *
  * @since 5.13
  * @see ClassTemplate
@@ -36,7 +35,7 @@ public interface ClassTemplateInvocationContext {
 	 * Get the display name for this invocation.
 	 *
 	 * <p>The supplied {@code invocationIndex} is incremented by the framework
-	 * with each container invocation. Thus, in the case of multiple active
+	 * with each class template invocation. Thus, in the case of multiple active
 	 * {@linkplain ClassTemplateInvocationContextProvider providers}, only the
 	 * first active provider receives indices starting with {@code 1}.
 	 *
@@ -51,16 +50,16 @@ default String getDisplayName(int invocationIndex) {
 	}
 
 	/**
-	 * Get the additional {@linkplain Extension extensions} for this invocation.
+	 * Get additional {@linkplain Extension extensions} for this invocation.
 	 *
 	 * <p>The extensions provided by this method will only be used for this
 	 * invocation of the class template. Thus, it does not make sense to return
-	 * an extension that acts solely on the container level (e.g.
-	 * {@link BeforeAllCallback}).
+	 * an extension that needs to perform some action at the container level,
+	 * such as an implementation of {@link BeforeAllCallback}.
 	 *
 	 * <p>The default implementation returns an empty list.
 	 *
-	 * @return the additional extensions for this invocation; never {@code null}
+	 * @return additional extensions for this invocation; never {@code null}
 	 * or containing {@code null} elements, but potentially empty
 	 */
 	default List<Extension> getAdditionalExtensions() {
@@ -74,7 +73,7 @@ default List<Extension> getAdditionalExtensions() {
 	 * {@link ExtensionContext.Store Store} to benefit from its cleanup support
 	 * or for retrieval by other extensions.
 	 *
-	 * @param context The invocation-level extension context.
+	 * @param context the invocation-level extension context
 	 */
 	default void prepareInvocation(ExtensionContext context) {
 	}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ClassTemplateInvocationContextProvider.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ClassTemplateInvocationContextProvider.java
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
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
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterInfo.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterInfo.java
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
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/ParameterDeclarations.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/ParameterDeclarations.java
