Merge branch 'main' into main

.github/actions/main-build/action.yml

@@ -5,13 +5,18 @@ inputs:
     required: true
     description: Gradle arguments
     default: build
+  dependency-graph:
+    required: false
+    description: 'see https://github.com/gradle/gradle-build-action#enable-dependency-graph-generation-for-a-workflow'
+    default: disabled
 runs:
   using: "composite"
   steps:
     - uses: ./.github/actions/setup-test-jdk
     - uses: ./.github/actions/run-gradle
       with:
         arguments: ${{ inputs.arguments }}
+        dependency-graph: ${{ inputs.dependency-graph }}
     - uses: actions/upload-artifact@v3
       if: ${{ always() }}
       with:

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

@@ -5,21 +5,26 @@ inputs:
     required: true
     description: Gradle arguments
     default: build
+  dependency-graph:
+    required: false
+    description: 'see https://github.com/gradle/gradle-build-action#enable-dependency-graph-generation-for-a-workflow'
+    default: disabled
 runs:
   using: "composite"
   steps:
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       id: setup-gradle-jdk
       with:
         distribution: temurin
-        java-version: 17
+        java-version: 21
     - uses: gradle/gradle-build-action@v2
       env:
         JAVA_HOME: ${{ steps.setup-gradle-jdk.outputs.path }}
       with:
+        dependency-graph: ${{ inputs.dependency-graph }}
         arguments: |
           -Porg.gradle.java.installations.auto-download=false
-          -Penterprise.predictiveTestSelection.enabled=${{ github.event_name == 'pull_request' }}
+          -Pdevelocity.predictiveTestSelection.enabled=${{ github.event_name == 'pull_request' }}
           "-Dscan.value.GitHub job=${{ github.job }}"
           javaToolchains
           ${{ inputs.arguments }}

.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@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 8

.github/workflows/close-inactive-issues.yml

@@ -10,7 +10,7 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           only-labels: "status: waiting-for-feedback"
           days-before-stale: 14

.github/workflows/codeql-analysis.yml

@@ -30,7 +30,7 @@ jobs:
           - javascript
     steps:
     - name: Check out repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
       with:

.github/workflows/combine-prs.yml

@@ -11,6 +11,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: combine-prs
-        uses: github/combine-prs@v3.1.1
+        uses: github/combine-prs@v5.0.0
         with:
           github_token: ${{ secrets.GH_TOKEN }}

.github/workflows/cross-version.yml

@@ -10,22 +10,20 @@ on:
       - '*'
 
 env:
-  ENTERPRISE_TESTDISTRIBUTION_ENABLED: true
-  BUILDCACHE_USERNAME: ${{ secrets.BUILD_CACHE_USERNAME }}
-  BUILDCACHE_PASSWORD: ${{ secrets.BUILD_CACHE_PASSWORD }}
+  DEVELOCITY_TESTDISTRIBUTION_ENABLED: true
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:
   openjdk:
     strategy:
       fail-fast: false
       matrix:
-        jdk: [20, 21, 22]
+        jdk: [22]
     name: "OpenJDK ${{ matrix.jdk }}"
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - name: Set up Test JDK

.github/workflows/gradle-wrapper-validation.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - name: Validate Gradle wrapper

.github/workflows/issue-labels.yml

@@ -9,7 +9,7 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         with:
           script: |
             github.rest.issues.addLabels({

.github/workflows/main.yml

@@ -10,17 +10,15 @@ on:
       - '*'
 
 env:
-  ENTERPRISE_TESTDISTRIBUTION_ENABLED: true
-  BUILDCACHE_USERNAME: ${{ secrets.BUILD_CACHE_USERNAME }}
-  BUILDCACHE_PASSWORD: ${{ secrets.BUILD_CACHE_PASSWORD }}
+  DEVELOCITY_TESTDISTRIBUTION_ENABLED: true
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:
   Linux:
     runs-on: ubuntu-latest
     steps:
     - name: Check out repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 1
     - name: Install Graphviz
@@ -31,12 +29,13 @@ jobs:
       uses: graalvm/setup-graalvm@v1
       with:
         version: 'latest'
-        java-version: '17'
+        java-version: '21'
         components: 'native-image'
         github-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Build
       uses: ./.github/actions/main-build
       with:
+        dependency-graph: generate-and-submit
         arguments: |
           -Ptesting.enableJaCoCo
           build
@@ -49,7 +48,7 @@ jobs:
     runs-on: windows-latest
     steps:
     - name: Check out repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 1
     - name: Build
@@ -59,7 +58,7 @@ jobs:
     runs-on: macos-latest
     steps:
     - name: Check out repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 1
     - name: Build
@@ -72,7 +71,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@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 1
     - name: Publish
@@ -93,18 +92,16 @@ jobs:
     if: github.event_name == 'push' && github.repository == 'junit-team/junit5' && github.ref == 'refs/heads/main'
     steps:
     - name: Check out repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 1
     - name: Install Graphviz
       run: |
         sudo apt-get update
         sudo apt-get install graphviz
-    - name: Restore Gradle cache and display toolchains
+    - name: Upload Documentation
       uses: ./.github/actions/run-gradle
       with:
-        arguments: --quiet
-    - name: Upload Documentation
+        arguments: gitPublishPush -Dscan.tag.Documentation
       env:
         GRGIT_USER: ${{ secrets.GH_TOKEN }}
-      run: ./gradle/scripts/publishDocumentationSnapshotOnlyIfNecessary.sh

.github/workflows/reproducible-build.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Check out repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 1
     - name: Restore Gradle cache and display toolchains

README.md

@@ -6,7 +6,7 @@ This repository is the home of _JUnit 5_.
 
 ## Latest Releases
 
-- General Availability (GA): [JUnit 5.10.0](https://github.com/junit-team/junit5/releases/tag/r5.10.0) (July 23, 2023)
+- General Availability (GA): [JUnit 5.10.1](https://github.com/junit-team/junit5/releases/tag/r5.10.1) (November 5, 2023)
 - Preview (Milestone/Release Candidate): N/A
 
 ## Documentation
@@ -46,11 +46,14 @@ A code coverage report can also be generated locally via the [Gradle Wrapper] by
 executing `./gradlew -Ptesting.enableJaCoCo clean jacocoRootReport`. The results will be available
 in `build/reports/jacoco/jacocoRootReport/html/index.html`.
 
-## Gradle Enterprise
+## Develocity
 
-[![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)
+[![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.junit.org/scans)
 
-JUnit 5 utilizes [Gradle Enterprise](https://gradle.com/) for _Build Scans_, _Build Cache_, and _Test Distribution_.
+JUnit 5 utilizes [Develocity](https://gradle.com/) for [Build Scans](https://scans.gradle.com/),
+[Build Cache](https://docs.gradle.org/current/userguide/build_cache.html),
+[Predictive Test Selection](https://docs.gradle.com/enterprise/predictive-test-selection/), and
+[Test Distribution](https://docs.gradle.com/enterprise/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.
@@ -62,7 +65,7 @@ task outputs from previous CI builds.
 
 ## Building from Source
 
-You need [JDK 17] to build JUnit 5. [Gradle toolchains] are used to detect and
+You need [JDK 21] 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_ and _tested_ with the [Gradle Wrapper] using the following command.
@@ -97,7 +100,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://foojay.io/almanac/java-17/
+[JDK 21]: https://javaalmanac.io/jdk/21/
 [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

SECURITY.md

@@ -2,10 +2,10 @@
 
 ## Supported Versions
 
-| Version | Supported          |
-| ------- | ------------------ |
-| 5.9.x   | :white_check_mark: |
-| < 5.9   | :x:                |
+| Version  | Supported          |
+| -------- | ------------------ |
+| 5.10.x   | :white_check_mark: |
+| < 5.10   | :x:                |
 
 ## Reporting a Vulnerability
 

documentation/documentation.gradle.kts

@@ -11,6 +11,7 @@ plugins {
 	alias(libs.plugins.asciidoctorConvert)
 	alias(libs.plugins.asciidoctorPdf)
 	alias(libs.plugins.gitPublish)
+	alias(libs.plugins.plantuml)
 	id("junitbuild.build-parameters")
 	id("junitbuild.kotlin-library-conventions")
 	id("junitbuild.testing-conventions")
@@ -63,8 +64,7 @@ dependencies {
 
 asciidoctorj {
 	modules {
-		diagram.use()
-		pdf.version(libs.versions.asciidoctor.pdf)
+		pdf.version(libs.versions.asciidoctorj.pdf)
 	}
 	requires(file("src/docs/asciidoc/resources/themes/rouge_junit.rb"))
 }
@@ -207,6 +207,13 @@ tasks {
 		outputFile = standaloneConsoleLauncherShadowedArtifactsFile
 	}
 
+	plantUml {
+		fileFormat = "SVG"
+		outputs.cacheIf { true }
+	}
+
+	val componentDiagram = plantUml.flatMap { it.outputDirectory.file("component-diagram.svg") }
+
 	withType<AbstractAsciidoctorTask>().configureEach {
 		inputs.files(
 			generateConsoleLauncherOptions,
@@ -215,14 +222,18 @@ tasks {
 			generateConsoleLauncherEnginesOptions,
 			generateExperimentalApisTable,
 			generateDeprecatedApisTable,
-			generateStandaloneConsoleLauncherShadowedArtifactsFile
+			generateStandaloneConsoleLauncherShadowedArtifactsFile,
+			componentDiagram
 		)
 
 		resources {
 			from(sourceDir) {
 				include("**/images/**/*.png")
 				include("**/images/**/*.svg")
 			}
+			from(componentDiagram) {
+				into("user-guide/images")
+			}
 		}
 
 		// Temporary workaround for https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/599

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]
+:StringConversionSupport:                    {javadoc-root}/org.junit.platform.commons/org/junit/platform/commons/support/conversion/StringConversionSupport.html[StringConversionSupport]
 :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]

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

@@ -6,6 +6,7 @@ Stefan Bechtold; Sam Brannen; Johannes Link; Matthias Merdes; Marc Philipp; Juli
 :docinfodir: {includedir}/docinfos
 :docinfo2:
 :numbered!:
+:last-update-label!:
 //
 
 This document contains the _change log_ for all JUnit 5 releases since 5.10 GA.
@@ -18,4 +19,6 @@ include::{includedir}/link-attributes.adoc[]
 
 include::{basedir}/release-notes-5.11.0-M1.adoc[]
 
+include::{basedir}/release-notes-5.10.1.adoc[]
+
 include::{basedir}/release-notes-5.10.0.adoc[]