Merge branch 'main' into feature/enable-specific-global-extensions-in-junit

Author: YongGoose

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

@@ -4,7 +4,7 @@ inputs:
   arguments:
     required: true
     description: Gradle arguments
-    default: :platform-tooling-support-tests:test build --configuration-cache
+    default: :platform-tooling-support-tests:test build --no-configuration-cache # Disable configuration cache due to https://github.com/diffplug/spotless/issues/2318
   encryptionKey:
     required: true
     description: Gradle cache encryption key

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

@@ -17,7 +17,7 @@ runs:
         distribution: temurin
         java-version: 21
         check-latest: true
-    - uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4
+    - uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4
       with:
         cache-encryption-key: ${{ inputs.encryptionKey }}
     - shell: bash

.github/workflows/codeql-analysis.yml

@@ -34,7 +34,7 @@ jobs:
     - name: Check out repository
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@9278e421667d5d90a2839487a482448c4ec7df4d # v3
+      uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3
       with:
         languages: ${{ matrix.language }}
         tools: linked
@@ -47,4 +47,4 @@ jobs:
           -Dscan.tag.CodeQL \
           allMainClasses
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@9278e421667d5d90a2839487a482448c4ec7df4d # v3
+      uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3

.github/workflows/cross-version.yml

@@ -65,7 +65,7 @@ jobs:
             -PjavaToolchain.version=${{ matrix.jdk.version }} \
             -Dscan.tag.JDK_${{ matrix.jdk.version }} \
             build \
-            --configuration-cache
+            --no-configuration-cache #Disable configuration cache due to https://github.com/diffplug/spotless/issues/2318
       - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
         if: ${{ always() }}
         with:
@@ -106,7 +106,7 @@ jobs:
             -Dscan.tag.JDK_${{ matrix.jdk }} \
             -Dscan.tag.OpenJ9 \
             build \
-            --configuration-cache
+            --no-configuration-cache # Disable configuration cache due to https://github.com/diffplug/spotless/issues/2318
       - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
         if: ${{ always() }}
         with:

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

@@ -25,4 +25,4 @@ jobs:
         java-version: 21
         check-latest: true
     - name: Generate and submit dependency graph
-      uses: gradle/actions/dependency-submission@d156388eb19639ec20ade50009f3d199ce1e2808 # v4
+      uses: gradle/actions/dependency-submission@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4

.github/workflows/main.yml

@@ -23,7 +23,7 @@ jobs:
       with:
         fetch-depth: 1
     - name: Install GraalVM
-      uses: graalvm/setup-graalvm@3aaf71e276c9159bbdfbcdab8abc50c95f41a2c8 # v1
+      uses: graalvm/setup-graalvm@4a200f28cd70d1940b5e33bd00830b7dc71a7e2b # v1
       with:
         distribution: graalvm-community
         version: 'latest'
@@ -38,7 +38,7 @@ jobs:
           :platform-tooling-support-tests:test \
           build \
           jacocoRootReport \
-          --configuration-cache
+          --no-configuration-cache # Disable configuration cache due to https://github.com/diffplug/spotless/issues/2318
     - name: Upload to Codecov.io
       uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4
       with:

.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@9278e421667d5d90a2839487a482448c4ec7df4d # v3
+        uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3
         with:
           sarif_file: results.sarif

.github/workflows/reproducible-build.yml

@@ -29,7 +29,7 @@ jobs:
         encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
         arguments: |
           --quiet \
-          --configuration-cache
+          --no-configuration-cache # Disable configuration cache due to https://github.com/diffplug/spotless/issues/2318
     - name: Build and compare checksums
       shell: bash
       run: |

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

@@ -38,9 +38,11 @@ JUnit repository on GitHub.
   `--select-file` and `--select-resource`.
 * `ConsoleLauncher` now accepts multiple values for all `--select` options.
 * Add `--select-unique-id` support to ConsoleLauncher.
-* The `junit-platform-reporting` module now contributes a section containing
-  JUnit-specific metadata about each test/container to the HTML report written by
-  open-test-reporting when added to the classpath/module path.
+* The following improvements have been made to the open-test-reporting XML output:
+  - Information about the Git repository, the current branch, the commit hash, and the
+    current worktree status are now included in the XML report, if applicable.
+  - A section containing JUnit-specific metadata about each test/container to the HTML
+    report is now written by open-test-reporting when added to the classpath/module path
 
 
 [[release-notes-5.12.0-M1-junit-jupiter]]

gradle/libs.versions.toml

@@ -87,7 +87,7 @@ asciidoctorPdf = { id = "org.asciidoctor.jvm.pdf", version.ref = "asciidoctor-pl
 bnd = { id = "biz.aQute.bnd", version.ref = "bnd" }
 buildParameters = { id = "org.gradlex.build-parameters", version = "1.4.4" }
 commonCustomUserData = { id = "com.gradle.common-custom-user-data-gradle-plugin", version = "2.0.2" }
-develocity = { id = "com.gradle.develocity", version = "3.18.1" }
+develocity = { id = "com.gradle.develocity", version = "3.18.2" }
 foojayResolver = { id = "org.gradle.toolchains.foojay-resolver", version = "0.8.0" }
 gitPublish = { id = "org.ajoberstar.git-publish", version = "4.2.2" }
 jmh = { id = "me.champeau.jmh", version = "0.7.2" }