From aa850ac452e1351b9dcf7728bbc16d3cd74beb12 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 31 Oct 2025 18:01:15 +0000
Subject: [PATCH 1/2] Update dependency com.uber.nullaway:nullaway to v0.12.11

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 39830c3ea0a9..df36c31d104f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -60,7 +60,7 @@ mockito-bom = { module = "org.mockito:mockito-bom", version = "5.20.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" }
-nullaway = { module = "com.uber.nullaway:nullaway", version = "0.12.10" }
+nullaway = { module = "com.uber.nullaway:nullaway", version = "0.12.11" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 openTestReporting-cli = { module = "org.opentest4j.reporting:open-test-reporting-cli", version.ref = "openTestReporting" }
 openTestReporting-events = { module = "org.opentest4j.reporting:open-test-reporting-events", version.ref = "openTestReporting" }

From 84b4ffdb53f04870e716434ee5931b500fe2d54c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 1 Nov 2025 09:41:07 +0100
Subject: [PATCH 2/2] Fix new nullability issues

---
 .../java/org/junit/jupiter/api/FailAssertionsTests.java    | 2 +-
 .../engine/extension/PreInterruptCallbackTests.java        | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java
index 7bfbc55878de..2a9c56d7307a 100644
--- a/jupiter-tests/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java
+++ b/jupiter-tests/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java
@@ -145,7 +145,7 @@ void failUsableAsAnExpression() {
 		long count = Stream.empty()
 				.peek(element -> fail("peek should never be called"))
 				.filter(element -> fail("filter should never be called", new Throwable("cause")))
-				.map(element -> fail(new Throwable("map should never be called")))
+				.map(element -> Assertions.<Throwable> fail(new Throwable("map should never be called")))
 				.sorted((e1, e2) -> fail(() -> "sorted should never be called"))
 				.count();
 		// @formatter:on
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/PreInterruptCallbackTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/PreInterruptCallbackTests.java
index e549af821ba7..3853d97b7114 100644
--- a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/PreInterruptCallbackTests.java
+++ b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/PreInterruptCallbackTests.java
@@ -36,6 +36,7 @@
 import java.util.function.UnaryOperator;
 
 import org.assertj.core.api.Condition;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -61,10 +62,10 @@ class PreInterruptCallbackTests extends AbstractJupiterTestEngineTests {
 	private static final String TC = "test";
 	private static final String TIMEOUT_ERROR_MSG = TC + "() timed out after 1 microsecond";
 	private static final AtomicBoolean interruptedTest = new AtomicBoolean();
-	private static final CompletableFuture<Void> testThreadExecutionDone = new CompletableFuture<>();
-	private static final AtomicReference<Thread> interruptedTestThread = new AtomicReference<>();
+	private static final CompletableFuture<?> testThreadExecutionDone = new CompletableFuture<>();
+	private static final AtomicReference<@Nullable Thread> interruptedTestThread = new AtomicReference<>();
 	private static final AtomicBoolean interruptCallbackShallThrowException = new AtomicBoolean();
-	private static final AtomicReference<PreInterruptContext> calledPreInterruptContext = new AtomicReference<>();
+	private static final AtomicReference<@Nullable PreInterruptContext> calledPreInterruptContext = new AtomicReference<>();
 
 	@BeforeEach
 	void setUp() {