Merge branch 'main' into marc/parallel-execution-custom-implementation

Author: marcphilipp

.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@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
+      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@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
+      uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/cross-version.yml

@@ -71,7 +71,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 +114,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/label-pull-request.yml

@@ -42,7 +42,7 @@ jobs:
             
             let labels = Array.from(new Set(repository.pullRequest.closingIssuesReferences.nodes
                 .flatMap((node) => node.labels.nodes.map((label) => label.name))))
-                .filter((label) => !label.startsWith("status:"));
+                .filter((label) => !label.startsWith("status:") && label !== "up-for-grabs");
             
             if (labels.length > 0) {
                 console.log(`Adding labels to PR: ${labels}`);

.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@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
+        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) 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/documentation.gradle.kts

@@ -16,7 +16,6 @@ plugins {
 	alias(libs.plugins.gitPublish)
 	alias(libs.plugins.plantuml)
 	id("junitbuild.build-parameters")
-	id("junitbuild.java-nullability-conventions")
 	id("junitbuild.kotlin-library-conventions")
 	id("junitbuild.testing-conventions")
 }

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`