Merge branch 'main' into marc/queue-order-consistency

Author: marcphilipp

.github/workflows/codeql.yml

@@ -45,7 +45,7 @@ jobs:
       with:
         persist-credentials: false
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
+      uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
       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@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
+      uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/cross-version.yml

@@ -33,7 +33,10 @@ jobs:
           type: ea
         - version: 26
           type: ea
-          release: leydenpremain
+          release: leyden
+        - version: 26
+          type: ea
+          release: valhalla
     name: "OpenJDK ${{ matrix.jdk.version }} (${{ matrix.jdk.release || matrix.jdk.type }})"
     runs-on: ubuntu-latest
     steps:

.github/workflows/ossf-scorecard.yml

@@ -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@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
+        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
         with:
           sarif_file: results.sarif

CONTRIBUTING.md

@@ -177,8 +177,8 @@ To deprecate an item:
 
 ## Building the Project
 
-Please refer to [the readme](README.md#building-from-source) for the most common
-build commands.
+Please refer to [the readme](README.md#building-from-source) and [the documentation readme](documentation/README.md) for
+the most common build commands.
 
 ### Build Cache
 

README.md

@@ -12,7 +12,7 @@ This repository is the home of JUnit Platform, Jupiter, and Vintage.
 
 ## Latest Releases
 
-- General Availability (GA): [JUnit 6.0.0](https://github.com/junit-team/junit-framework/releases/tag/r6.0.0) (September 30, 2025)
+- General Availability (GA): [JUnit 6.0.1](https://github.com/junit-team/junit-framework/releases/tag/r6.0.1) (October 31, 2025)
 - Preview (Milestone/Release Candidate): N/A
 
 ## Documentation

RELEASING.md

@@ -29,7 +29,7 @@
 
 ### Feature releases (x.y.0)
 
-- [ ] Clear `accepted-breaking-changes.txt`, change `previousVersion` in `gradle.properties` to `x.y.0` on the release branch, and commit with message "Update API baseline and clear accepted breaking changes"
+- [ ] Delete `accepted-breaking-changes.csv` (if it exists), change `previousVersion` in `gradle.properties` to `x.y.0` on the release branch, and commit with message "Update API baseline and clear accepted breaking changes"
 - [ ] Fast-forward merge the release branch to `main` and push to GitHub
 - [ ] Update the [security policy](https://github.com/junit-team/junit-framework/blob/main/SECURITY.md) and commit with message "Update security policy to reflect 5.x release" or similar
 - [ ] Create release notes for the next feature release from the template
@@ -38,6 +38,6 @@
 ### Patch releases (x.y.z)
 
 - [ ] Cherry-pick the tagged commit from the release branch to `main` and resolve the conflict in `gradle.properties` by choosing the version of the `main` branch
-- [ ] Clear `accepted-breaking-changes.txt`, change `previousVersion` in `gradle.properties` to `x.y.z` on the release branch, and commit with message "Update API baseline and clear accepted breaking changes"
+- [ ] Delete `accepted-breaking-changes.csv` (if it exists), change `previousVersion` in `gradle.properties` to `x.y.z` on the release branch, and commit with message "Update API baseline and clear accepted breaking changes"
 - [ ] Include the release notes of the patch release on `main` if not already present
 - [ ] Update [JBang catalog](https://github.com/junit-team/jbang-catalog/blob/main/jbang-catalog.json)

documentation/README.md

@@ -18,7 +18,7 @@ This following Gradle command generates the HTML version of the User Guide as
 `build/docs/asciidoc/user-guide/index.html`.
 
 ```
-gradlew asciidoctor
+./gradlew asciidoctor
 ```
 
 On Linux operating systems, the `graphviz` package providing `/usr/bin/dot` must be
@@ -30,5 +30,5 @@ This following Gradle command generates the PDF version of the User Guide to
 `build/docs/asciidocPdf/user-guide/index.pdf`.
 
 ```
-gradlew asciidoctorPdf
+./gradlew asciidoctorPdf
 ```

documentation/documentation.gradle.kts

@@ -268,7 +268,7 @@ tasks {
 		outputs.cacheIf { true }
 	}
 
-	val componentDiagram = plantUml.flatMap { it.outputDirectory.file("component-diagram.svg") }
+	val plantUmlOutputDirectory = plantUml.flatMap { it.outputDirectory }
 
 	withType<AbstractAsciidoctorTask>().configureEach {
 		inputs.files(
@@ -278,15 +278,15 @@ tasks {
 			generateConsoleLauncherEnginesOptions,
 			generateApiTables,
 			generateStandaloneConsoleLauncherShadowedArtifactsFile,
-			componentDiagram
+			plantUmlOutputDirectory
 		)
 
 		resources {
 			from(sourceDir) {
 				include("**/images/**/*.png")
 				include("**/images/**/*.svg")
 			}
-			from(componentDiagram) {
+			from(plantUmlOutputDirectory) {
 				into("user-guide/images")
 			}
 		}
@@ -363,7 +363,12 @@ tasks {
 	}
 
 	asciidoctorPdf {
-		setExecutionMode(JAVA_EXEC) // Avoid classpath conflicts with other Gradle plugins (e.g. JReleaser)
+		// Avoid classpath conflicts with other Gradle plugins (e.g. JReleaser)
+		// Avoid propagating apparent memory leaks in Asciidoctor/JRuby to Gradle daemon.
+		setExecutionMode(JAVA_EXEC)
+		jvm {
+			maxHeapSize = "512M"
+		}
 		sources {
 			include("user-guide/index.adoc")
 		}

documentation/src/docs/asciidoc/docinfos/docinfo.html

@@ -11,6 +11,11 @@
     .is-collapsible{ max-height:3000px; overflow:hidden; }
     .is-collapsed{ max-height:0 }
     .is-active-link{ font-weight:700 }
+    table {
+      overflow-x: auto;
+      display: block;
+      border-width: 0;
+    }
   }
   @media print{
     #tocbot a.toc-link.node-name--H4{ display:none }

documentation/src/docs/asciidoc/link-attributes.adoc

@@ -224,9 +224,9 @@ endif::[]
 :TestReporterParameterResolver:              {current-branch}/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestReporterParameterResolver.java[TestReporterParameterResolver]
 :TypeBasedParameterResolver:                 {current-branch}/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolver.java[TypeBasedParameterResolver]
 // Jupiter Examples
-:CustomAnnotationParameterResolver:          {current-branch}/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotationParameterResolver.java[CustomAnnotationParameterResolver]
-:CustomTypeParameterResolver:                {current-branch}/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomTypeParameterResolver.java[CustomTypeParameterResolver]
-:MapOfListsTypeBasedParameterResolver:       {current-branch}/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfListsTypeBasedParameterResolver.java[MapOfListsTypeBasedParameterResolver]
+:CustomAnnotationParameterResolver:          {current-branch}/jupiter-tests/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotationParameterResolver.java[CustomAnnotationParameterResolver]
+:CustomTypeParameterResolver:                {current-branch}/jupiter-tests/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomTypeParameterResolver.java[CustomTypeParameterResolver]
+:MapOfListsTypeBasedParameterResolver:       {current-branch}/jupiter-tests/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfListsTypeBasedParameterResolver.java[MapOfListsTypeBasedParameterResolver]
 // Jupiter Migration Support
 :EnableJUnit4MigrationSupport:               {javadoc-root}/org.junit.jupiter.migrationsupport/org/junit/jupiter/migrationsupport/EnableJUnit4MigrationSupport.html[@EnableJUnit4MigrationSupport]
 :EnableRuleMigrationSupport:                 {javadoc-root}/org.junit.jupiter.migrationsupport/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupport.html[@EnableRuleMigrationSupport]