Merge branch '4.0.x'

Closes gh-50845

Author: wilkinsona

core/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssert.java

@@ -251,7 +251,7 @@ public <T> AbstractObjectArrayAssert<?, String> getBeanNames(Class<T> type) {
 	 * given type
 	 */
 	@CheckReturnValue
-	public <T> AbstractObjectAssert<?, T> getBean(Class<T> type) {
+	public <T> AbstractObjectAssert<?, @Nullable T> getBean(Class<T> type) {
 		return getBean(type, Scope.INCLUDE_ANCESTORS);
 	}
 
@@ -273,7 +273,7 @@ public <T> AbstractObjectAssert<?, T> getBean(Class<T> type) {
 	 * given type
 	 */
 	@CheckReturnValue
-	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(
@@ -334,7 +334,7 @@ private boolean isPrimary(String name, Scope scope) {
 	 * @throws AssertionError if the application context did not start
 	 */
 	@CheckReturnValue
-	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));
@@ -362,7 +362,7 @@ public AbstractObjectAssert<?, Object> getBean(String name) {
 	 */
 	@SuppressWarnings("unchecked")
 	@CheckReturnValue
-	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));

gradle.properties

@@ -19,7 +19,7 @@ kotlinVersion=2.3.21
 mavenVersion=3.9.13
 mockitoVersion=5.23.0
 nativeBuildToolsVersion=1.1.1
-nullabilityPluginVersion=0.0.11
+nullabilityPluginVersion=0.0.14
 snakeYamlVersion=2.6
 springGrpcVersion=1.1.0
 springFrameworkVersion=7.0.8