Merge branch 'main' into ogu1208/kotlin-value-class-support

Ogu1208 · web-flow · commit cf2abacf4e15 · 2025-12-14T17:08:42.000+09:00
diff --git a/.github/actions/main-build/action.yml b/.github/actions/main-build/action.yml
@@ -16,7 +16,7 @@ runs:
       with:
         arguments: ${{ inputs.arguments }}
         encryptionKey: ${{ inputs.encryptionKey }}
-    - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+    - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
       if: ${{ always() }}
       with:
         name: Open Test Reports (${{ github.job }})
diff --git a/.github/codecov.yml b/.github/codecov.yml
@@ -6,7 +6,12 @@ coverage:
       default:
         threshold: "1"
         informational: true
-    patch: off
+    patch:
+      default:
+        target: auto
+        # Do not allow coverage to decrease 
+        threshold: 0
+        only_pulls: true
 
 codecov:
   max_report_age: off
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -45,7 +45,7 @@ jobs:
       with:
         persist-credentials: false
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
+      uses: github/codeql-action/init@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
       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@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
+      uses: github/codeql-action/analyze@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
@@ -74,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@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+      - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         if: ${{ always() }}
         with:
           name: Open Test Reports (${{ github.job }} ${{ matrix.jdk.version }} (${{ matrix.jdk.release || matrix.jdk.type }}))
@@ -117,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@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+      - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         if: ${{ always() }}
         with:
           name: Open Test Reports (${{ github.job }})
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -46,7 +46,7 @@ jobs:
           jacocoRootReport \
           --no-configuration-cache # Disable configuration cache due to https://github.com/diffplug/spotless/issues/2318
     - name: Upload to Codecov.io
-      uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+      uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
 
diff --git a/.github/workflows/ossf-scorecard.yml b/.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@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.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@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
+        uses: github/codeql-action/upload-sarif@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
         with:
           sarif_file: results.sarif
diff --git a/documentation/.tool-versions b/documentation/.tool-versions
@@ -1 +1 @@
-nodejs 24.11.1
+nodejs 24.12.0
diff --git a/documentation/antora.yml b/documentation/antora.yml
@@ -1,5 +1,5 @@
 name: junit
-version: null
+version: true
 title: JUnit
 nav:
   - modules/ROOT/nav.adoc
diff --git a/documentation/modules/ROOT/pages/advanced-topics/launcher-api.adoc b/documentation/modules/ROOT/pages/advanced-topics/launcher-api.adoc
@@ -363,7 +363,7 @@ failed can be achieved as follows.
 
 [source,java,indent=0]
 ----
-include::example$java/example/UsingTheLauncherDemo.java[tags=cancellation]
+include::example$java/example/UsingTheLauncherDemo.java[tags=cancellation-direct]
 ----
 <1> Create a `{CancellationToken}`
 <2> Implement a `{TestExecutionListener}` that calls `cancel()` when a test fails
@@ -387,3 +387,37 @@ At the time of writing, the following test engines support cancellation:
 * `{junit-platform-suite-engine}`
 * Any `{TestEngine}` extending `{HierarchicalTestEngine}` such as Spock and Cucumber
 ====
+
+[[launcher-cancellation-execution-request-from-discovery-request]]
+=== Building a LauncherExecutionRequest from a LauncherDiscoveryRequest
+
+Rather than building a `{LauncherExecutionRequest}` by starting with a
+`{LauncherDiscoveryRequestBuilder}` and calling `forExecution()`, you can create a
+`{LauncherExecutionRequestBuilder}` from a previously built `{LauncherDiscoveryRequest}`.
+
+[source,java,indent=0]
+----
+include::example$java/example/UsingTheLauncherDemo.java[tags=cancellation-discovery-request]
+----
+<1> Build a `{LauncherDiscoveryRequest}`
+<2> Create a `{LauncherExecutionRequestBuilder}` with it
+<3> Register the cancellation token
+<4> Register the listener
+<5> Pass the `{LauncherExecutionRequest}` to `Launcher.execute`
+
+[[launcher-cancellation-execution-request-from-test-plan]]
+=== Building a LauncherExecutionRequest from a TestPlan
+
+Alternatively, a `{LauncherExecutionRequestBuilder}` can be created from a previously
+discovered `{TestPlan}`.
+
+[source,java,indent=0]
+----
+include::example$java/example/UsingTheLauncherDemo.java[tags=cancellation-test-plan]
+----
+<1> Build a `{LauncherDiscoveryRequest}`
+<2> Discover a `{TestPlan}` via `Launcher.discover`
+<3> Create a `{LauncherExecutionRequestBuilder}` with it
+<4> Register the cancellation token
+<5> Register the listener
+<6> Pass the `{LauncherExecutionRequest}` to `Launcher.execute`
diff --git a/documentation/modules/ROOT/pages/overview.adoc b/documentation/modules/ROOT/pages/overview.adoc
@@ -1,5 +1,5 @@
 = Overview
-:page-aliases: user-guide/index.adoc
+:page-aliases: index.adoc, user-guide/index.adoc
 
 The goal of this document is to provide comprehensive reference documentation for
 programmers writing tests, extension authors, and engine authors as well as build tool
diff --git a/documentation/modules/ROOT/partials/release-notes/release-notes-6.1.0-M2.adoc b/documentation/modules/ROOT/partials/release-notes/release-notes-6.1.0-M2.adoc
@@ -25,7 +25,8 @@ repository on GitHub.
 [[v6.1.0-M2-junit-platform-new-features-and-improvements]]
 ==== New Features and Improvements
 
-* ❓
+* The `UniqueId.uniqueIdFormat` field has been removed, reducing the size of `UniqueId`
+  objects.
 
 [[v6.1.0-M2-junit-jupiter]]
 === JUnit Jupiter
@@ -52,6 +53,7 @@ repository on GitHub.
   methods for `AssertionFailureBuilder`. These allow user defined assertions to
   trim their stacktrace.
 
+
 [[v6.1.0-M2-junit-vintage]]
 === JUnit Vintage
 
diff --git a/documentation/package.json b/documentation/package.json
@@ -5,7 +5,7 @@
   },
   "dependencies": {
     "@antora/collector-extension": "1.0.2",
-    "@antora/lunr-extension": "1.0.0-alpha.10",
+    "@antora/lunr-extension": "1.0.0-alpha.12",
     "@springio/antora-extensions": "1.14.7",
     "highlight.js": "11.11.1"
   }
diff --git a/documentation/src/test/java/example/UsingTheLauncherDemo.java b/documentation/src/test/java/example/UsingTheLauncherDemo.java
@@ -36,6 +36,7 @@
 import org.junit.platform.launcher.TestPlan;
 import org.junit.platform.launcher.core.LauncherConfig;
 import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
+import org.junit.platform.launcher.core.LauncherExecutionRequestBuilder;
 import org.junit.platform.launcher.core.LauncherFactory;
 import org.junit.platform.launcher.listeners.SummaryGeneratingListener;
 import org.junit.platform.launcher.listeners.TestExecutionSummary;
@@ -119,8 +120,8 @@ void launcherConfig() {
 
 	@Test
 	@SuppressWarnings("unused")
-	void cancellation() {
-		// tag::cancellation[]
+	void cancellationDirect() {
+		// tag::cancellation-direct[]
 		CancellationToken cancellationToken = CancellationToken.create(); // <1>
 
 		TestExecutionListener failFastListener = new TestExecutionListener() {
@@ -132,24 +133,92 @@ public void executionFinished(TestIdentifier identifier, TestExecutionResult res
 			}
 		};
 
-		// end::cancellation[]
+		// end::cancellation-direct[]
 		// @formatter:off
-		// tag::cancellation[]
+		// tag::cancellation-direct[]
 		LauncherExecutionRequest executionRequest = LauncherDiscoveryRequestBuilder.request()
 				.selectors(selectClass(MyTestClass.class))
 				.forExecution()
+				// end::cancellation-direct[]
+				// @formatter:on
+				// tag::cancellation-direct[]
 				.cancellationToken(cancellationToken) // <3>
 				.listeners(failFastListener) // <4>
 				.build();
-		// end::cancellation[]
+
+		try (LauncherSession session = LauncherFactory.openSession()) {
+			session.getLauncher().execute(executionRequest); // <5>
+		}
+		// end::cancellation-direct[]
+	}
+
+	@Test
+	@SuppressWarnings("unused")
+	void cancellationFromDiscoveryRequest() {
+		CancellationToken cancellationToken = CancellationToken.create();
+
+		TestExecutionListener failFastListener = new TestExecutionListener() {
+			@Override
+			public void executionFinished(TestIdentifier identifier, TestExecutionResult result) {
+				if (result.getStatus() == FAILED) {
+					cancellationToken.cancel();
+				}
+			}
+		};
+
 		// @formatter:off
-		// tag::cancellation[]
+		// tag::cancellation-discovery-request[]
+		LauncherDiscoveryRequest discoveryRequest = LauncherDiscoveryRequestBuilder.request()
+				.selectors(selectClass(MyTestClass.class))
+				.build(); // <1>
+		// end::cancellation-discovery-request[]
+		// @formatter:on
+		// tag::cancellation-discovery-request[]
+
+		LauncherExecutionRequest executionRequest = LauncherExecutionRequestBuilder.request(discoveryRequest) // <2>
+				.cancellationToken(cancellationToken) // <3>
+				.listeners(failFastListener) // <4>
+				.build();
 
 		try (LauncherSession session = LauncherFactory.openSession()) {
 			session.getLauncher().execute(executionRequest); // <5>
 		}
-		// end::cancellation[]
+		// end::cancellation-discovery-request[]
+	}
+
+	@Test
+	@SuppressWarnings("unused")
+	void cancellationFromTestPlan() {
+		CancellationToken cancellationToken = CancellationToken.create();
+
+		TestExecutionListener failFastListener = new TestExecutionListener() {
+			@Override
+			public void executionFinished(TestIdentifier identifier, TestExecutionResult result) {
+				if (result.getStatus() == FAILED) {
+					cancellationToken.cancel();
+				}
+			}
+		};
+
+		// @formatter:off
+		// tag::cancellation-test-plan[]
+		LauncherDiscoveryRequest discoveryRequest = LauncherDiscoveryRequestBuilder.request()
+				.selectors(selectClass(MyTestClass.class))
+				.build(); // <1>
+		// end::cancellation-test-plan[]
 		// @formatter:on
+		// tag::cancellation-test-plan[]
+
+		try (LauncherSession session = LauncherFactory.openSession()) {
+			var launcher = session.getLauncher();
+			TestPlan testPlan = launcher.discover(discoveryRequest); // <2>
+			LauncherExecutionRequest executionRequest = LauncherExecutionRequestBuilder.request(testPlan) // <3>
+					.cancellationToken(cancellationToken) // <4>
+					.listeners(failFastListener) // <5>
+					.build();
+			launcher.execute(executionRequest); // <6>
+		}
+		// end::cancellation-test-plan[]
 	}
 
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ apiguardian = "1.1.2"
 assertj = "3.27.6"
 bnd = "7.1.0"
 checkstyle = "12.2.0"
-eclipse = "4.37.0"
+eclipse = "4.38.0"
 jackson = "2.20.1"
 jacoco = "0.8.14"
 jmh = "1.37"
@@ -53,7 +53,7 @@ log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4
 maven = { module = "org.apache.maven:apache-maven", version = "3.9.11" }
 mavenSurefirePlugin = { module = "org.apache.maven.plugins:maven-surefire-plugin", version.ref = "surefire" }
 memoryfilesystem = { module = "com.github.marschall:memoryfilesystem", version = "2.8.2" }
-mockito-bom = { module = "org.mockito:mockito-bom", version = "5.20.0" }
+mockito-bom = { module = "org.mockito:mockito-bom", version = "5.21.0" }
 mockito-core = { module = "org.mockito:mockito-core" }
 mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter" }
 nohttp-checkstyle = { module = "io.spring.nohttp:nohttp-checkstyle", version = "0.0.11" }
@@ -91,7 +91,7 @@ xmlunit = ["xmlunit-assertj", "xmlunit-placeholders", "xmlunit-jakarta-jaxb-impl
 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.4.0" }
-develocity = { id = "com.gradle.develocity", version = "4.2.2" }
+develocity = { id = "com.gradle.develocity", version = "4.3" }
 download = { id = "de.undercouch.download", version = "5.6.0" }
 errorProne = { id = "net.ltgt.errorprone", version = "4.3.0" }
 foojayResolver = { id = "org.gradle.toolchains.foojay-resolver", version = "1.0.0" }
diff --git a/gradle/plugins/antora/src/main/kotlin/junitbuild.antora-conventions.gradle.kts b/gradle/plugins/antora/src/main/kotlin/junitbuild.antora-conventions.gradle.kts
@@ -20,10 +20,12 @@ val generateAntoraPlaybook by tasks.registering(Copy::class) {
 	val gitRepoRoot = providers.exec {
 		commandLine("git", "worktree", "list", "--porcelain", "-z")
 	}.standardOutput.asText.map { it.substringBefore('\u0000').substringAfter(' ') }
+	inputs.property("gitRepoRoot", gitRepoRoot)
 
 	val gitBranchName = providers.exec {
 		commandLine("git", "rev-parse", "--abbrev-ref", "HEAD")
 	}.standardOutput.asText.map { it.trim() }
+	inputs.property("gitBranchName", gitBranchName)
 
 	from(layout.projectDirectory.file("antora-playbook.yml").asFile)
 	filter { line ->
diff --git a/gradle/plugins/backward-compatibility/src/main/kotlin/junitbuild/compatibility/roseau/RoseauDiff.kt b/gradle/plugins/backward-compatibility/src/main/kotlin/junitbuild/compatibility/roseau/RoseauDiff.kt
@@ -76,6 +76,7 @@ abstract class RoseauDiff : DefaultTask() {
                 "--diff",
                 "--fail-on-bc",
                 "--config", effectiveConfigFile.absolutePath,
+                "-vv",
             )
             if (acceptedChangesCsvFile.isPresent) {
                 args("--ignored", acceptedChangesCsvFile.get().asFile.absolutePath)
@@ -87,14 +88,6 @@ abstract class RoseauDiff : DefaultTask() {
         if (result.exitValue != 0) {
             System.out.write(output.toByteArray())
             System.out.flush()
-            reports.filter { it.file.exists() }.let { writtenReports ->
-                if (writtenReports.isNotEmpty()) {
-                    println("Reports:")
-                    writtenReports.forEach {
-                        println("- ${it.format.name}: ${it.file.toURI()}")
-                    }
-                }
-            }
             if (result.exitValue == 1) {
                 throw GradleException("Breaking API changes detected")
             }
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueIdFormat.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueIdFormat.java
diff --git a/junit-start/src/main/java/org/junit/start/JUnit.java b/junit-start/src/main/java/org/junit/start/JUnit.java
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdFormatTests.java b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdFormatTests.java
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
