From 2b7f6f3c6932a12e15d4eaed29592c73e661f944 Mon Sep 17 00:00:00 2001
From: Manu Sridharan <msridhar@gmail.com>
Date: Fri, 5 Jun 2026 12:50:49 -0700
Subject: [PATCH 1/2] Address new warnings from NullAway 0.13.6

Signed-off-by: Manu Sridharan <msridhar@gmail.com>

See gh-50701
---
 .../boot/test/context/assertj/ApplicationContextAssert.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssert.java b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssert.java
index 37f8e71175c..6fca20b6852 100644
--- a/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssert.java
+++ b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssert.java
@@ -269,7 +269,7 @@ public class ApplicationContextAssert<C extends ApplicationContext>
 	 * @throws AssertionError if the application context contains multiple beans of the
 	 * given type
 	 */
-	public <T> AbstractObjectAssert<?, T> getBean(Class<T> type, Scope scope) {
+	public <T> AbstractObjectAssert<?, @Nullable T> getBean(Class<T> type, Scope scope) {
 		Assert.notNull(scope, "'scope' must not be null");
 		if (this.startupFailure != null) {
 			throwAssertionError(
@@ -329,7 +329,7 @@ public class ApplicationContextAssert<C extends ApplicationContext>
 	 * is found
 	 * @throws AssertionError if the application context did not start
 	 */
-	public AbstractObjectAssert<?, Object> getBean(String name) {
+	public AbstractObjectAssert<?, @Nullable Object> getBean(String name) {
 		if (this.startupFailure != null) {
 			throwAssertionError(
 					contextFailedToStartWhenExpecting(this.startupFailure, "to contain a bean of name:%n <%s>", name));
@@ -356,7 +356,7 @@ public class ApplicationContextAssert<C extends ApplicationContext>
 	 * name but a different type
 	 */
 	@SuppressWarnings("unchecked")
-	public <T> AbstractObjectAssert<?, T> getBean(String name, Class<T> type) {
+	public <T> AbstractObjectAssert<?, @Nullable T> getBean(String name, Class<T> type) {
 		if (this.startupFailure != null) {
 			throwAssertionError(contextFailedToStartWhenExpecting(this.startupFailure,
 					"to contain a bean of name:%n <%s> (%s)", name, type));

From 8715efc615597511979de23617246e18d3e3b640 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <andy.wilkinson@broadcom.com>
Date: Wed, 24 Jun 2026 13:16:40 +0100
Subject: [PATCH 2/2] Polish "Address new warnings from NullAway 0.13.6"

See gh-50701
---
 .../boot/test/context/assertj/ApplicationContextAssert.java     | 2 +-
 gradle.properties                                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssert.java b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssert.java
index 6fca20b6852..9e3ba932f74 100644
--- a/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssert.java
+++ b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssert.java
@@ -248,7 +248,7 @@ public class ApplicationContextAssert<C extends ApplicationContext>
 	 * @throws AssertionError if the application context contains multiple beans of the
 	 * given type
 	 */
-	public <T> AbstractObjectAssert<?, T> getBean(Class<T> type) {
+	public <T> AbstractObjectAssert<?, @Nullable T> getBean(Class<T> type) {
 		return getBean(type, Scope.INCLUDE_ANCESTORS);
 	}
 
diff --git a/gradle.properties b/gradle.properties
index 1fa1e034f25..05911ef98bc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,7 @@ kotlinVersion=2.2.21
 mavenVersion=3.9.13
 mockitoVersion=5.20.0
 nativeBuildToolsVersion=0.11.5
-nullabilityPluginVersion=0.0.11
+nullabilityPluginVersion=0.0.14
 snakeYamlVersion=2.5
 springFrameworkVersion=7.0.8
 springFramework60xVersion=6.0.23