Merge remote-tracking branch 'origin/main' into rien/junit-platform-suite-engine-documentation

Author: mpkorstanje

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

@@ -16,7 +16,7 @@ runs:
       with:
         arguments: ${{ inputs.arguments }}
         encryptionKey: ${{ inputs.encryptionKey }}
-    - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+    - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
       if: ${{ always() }}
       with:
         name: Open Test Reports (${{ github.job }})

.github/workflows/codeql.yml

@@ -45,7 +45,7 @@ jobs:
       with:
         persist-credentials: false
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
+      uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
       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@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
+      uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
       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:
@@ -71,7 +74,7 @@ jobs:
             -Dscan.tag.JDK_${{ matrix.jdk.version }} \
             build \
             --no-configuration-cache #Disable configuration cache due to https://github.com/diffplug/spotless/issues/2318
-      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         if: ${{ always() }}
         with:
           name: Open Test Reports (${{ github.job }} ${{ matrix.jdk.version }} (${{ matrix.jdk.release || matrix.jdk.type }}))
@@ -114,7 +117,7 @@ jobs:
             -Dscan.tag.OpenJ9 \
             build \
             --no-configuration-cache # Disable configuration cache due to https://github.com/diffplug/spotless/issues/2318
-      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         if: ${{ always() }}
         with:
           name: Open Test Reports (${{ github.job }})

.github/workflows/main.yml

@@ -31,7 +31,7 @@ jobs:
         fetch-depth: 1
         persist-credentials: false
     - name: Install GraalVM
-      uses: graalvm/setup-graalvm@2a2412009026a83f51d179f92dc2b3fd4c8142df # v1.4.1
+      uses: graalvm/setup-graalvm@eec48106e0bf45f2976c2ff0c3e22395cced8243 # v1.4.2
       with:
         distribution: graalvm-community
         version: 'latest'

.github/workflows/ossf-scorecard.yml

@@ -48,7 +48,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: SARIF file
           path: results.sarif
@@ -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@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
+        uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
         with:
           sarif_file: results.sarif

CONTRIBUTING.md

@@ -180,6 +180,16 @@ To deprecate an item:
 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
+
+Local builds can reuse outputs from previous CI builds via Gradle's [Build Cache](https://docs.gradle.org/current/userguide/build_cache.html).
+The default build cache server is located in the US.
+If you're in Europe, you can configure the build to use a build cache node located in the EU by adding the following to the `gradle.properties` file in your [Gradle user home](https://docs.gradle.org/current/userguide/directory_layout.html#dir:gradle_user_home):
+
+```properties
+junit.develocity.buildCache.server=https://eu-build-cache-ge.junit.org
+```
+
 ### Build Parameters
 
 The build can be influenced by a number of parameters. For example, measuring

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

@@ -251,7 +251,7 @@ endif::[]
 :Log4j:                                      https://logging.apache.org/log4j/2.x/[Log4j]
 :Log4j_JDK_Logging_Adapter:                  https://logging.apache.org/log4j/2.x/log4j-jul/index.html[Log4j JDK Logging Adapter]
 :Logback:                                    https://logback.qos.ch/[Logback]
-:LogManager:                                 https://docs.oracle.com/javase/8/docs/api/java/util/logging/LogManager.html[LogManager]
+:LogManager:                                 https://docs.oracle.com/en/java/javase/17/docs/api/java.logging/java/util/logging/LogManager.html[LogManager]
 :Maven_Central:                              https://central.sonatype.com/[Maven Central]
 :MockitoExtension:                           https://github.com/mockito/mockito/blob/release/2.x/subprojects/junit-jupiter/src/main/java/org/mockito/junit/jupiter/MockitoExtension.java[MockitoExtension]
 :ServiceLoader:                              {jdk-javadoc-base-url}/java.base/java/util/ServiceLoader.html[ServiceLoader]

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

@@ -5,7 +5,7 @@
 
 *Scope:*
 
-* Java 17 and Kotlin 2.2 baseline
+* Java 17 and Kotlin 2.1 baseline
 * Single version number for Platform, Jupiter, and Vintage
 * Use of JSpecify annotations to express nullability
 * Integration of JFR functionality in `junit-platform-launcher`

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

@@ -16,7 +16,9 @@ repository on GitHub.
 [[release-notes-6.0.1-junit-platform-bug-fixes]]
 ==== Bug Fixes
 
-* ❓
+* The `jdk.jfr` package is now an optional import when using the `junit-platform-launcher`
+  as an OSGi bundle.
+* Remove remnants of Java 8 compatibility from User Guide.
 
 [[release-notes-6.0.1-junit-platform-deprecations-and-breaking-changes]]
 ==== Deprecations and Breaking Changes
@@ -43,6 +45,10 @@ repository on GitHub.
   to avoid conflicts with other control characters.
 * Fix `IllegalAccessError` thrown when using the Kotlin-specific `assertDoesNotThrow`
   assertion.
+* Stop reporting discovery issues for synthetic methods, particularly in conjunction with
+  Kotlin suspend functions.
+* Fix support for test methods with the same signature as a package-private methods
+  declared in super classes in different packages.
 
 [[release-notes-6.0.1-junit-jupiter-deprecations-and-breaking-changes]]
 ==== Deprecations and Breaking Changes
@@ -54,6 +60,10 @@ repository on GitHub.
 
 * The `@CsvSource` and `@CsvFileSource` annotations now allow specifying
   a custom comment character using the new `commentCharacter` attribute.
+* Improve error message when using `@ParameterizedClass` with field injection and not
+  providing enough arguments.
+* Allow calling `TypedArgumentConverter` constructor for `@Nullable T` target types
+  without having to cast class literals to `Class<@Nullable T>`.
 
 
 [[release-notes-6.0.1-junit-vintage]]

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

@@ -28,6 +28,12 @@ repository on GitHub.
 
 * Support for creating a `ModuleSelector` from a `java.lang.Module` and using
   its classloader for test discovery.
+* `OpenTestReportGeneratingListener` now supports redirecting XML events to a socket via
+  the new `junit.platform.reporting.open.xml.socket` configuration parameter. When set to a
+  port number, events are sent to `127.0.0.1:<port>` instead of being written to a file.
+* Allow implementations of `HierarchicalTestEngine` to specify which nodes require the
+  global read lock by overriding the `Node.isGlobalReadLockRequired()` method to return
+  `false`.
 
 
 [[release-notes-6.1.0-M1-junit-jupiter]]