Merge branch 'main' into 4.0.x

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/graphql/GraphQlTest.java

@@ -65,9 +65,9 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
  * {@link AutoConfigureGraphQlTester @AutoConfigureGraphQlTester}.
  * <p>
  * Typically {@code @GraphQlTest} is used in combination with
- * {@link org.springframework.boot.test.mock.mockito.MockBean @MockBean} or
- * {@link org.springframework.context.annotation.Import @Import} to load any collaborators
- * and other components required for the tests.
+ * {@link org.springframework.test.context.bean.override.mockito.MockitoBean @MockitoBean}
+ * or {@link org.springframework.context.annotation.Import @Import} to load any
+ * collaborators and other components required for the tests.
  * <p>
  * To load your full application configuration instead and test via
  * {@code HttpGraphQlTester}, consider using

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/reactive/WebFluxTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -68,9 +68,9 @@ import org.springframework.test.web.reactive.server.WebTestClient;
  * {@link AutoConfigureWebTestClient @AutoConfigureWebTestClient} annotation can be used.
  * <p>
  * Typically {@code @WebFluxTest} is used in combination with
- * {@link org.springframework.boot.test.mock.mockito.MockBean @MockBean} or
- * {@link Import @Import} to create any collaborators required by your {@code @Controller}
- * beans.
+ * {@link org.springframework.test.context.bean.override.mockito.MockitoBean @MockitoBean}
+ * or {@link Import @Import} to create any collaborators required by your
+ * {@code @Controller} beans.
  * <p>
  * If you are looking to load your full application configuration and use WebTestClient,
  * you should consider {@link SpringBootTest @SpringBootTest} combined with

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,9 +76,9 @@ import org.springframework.test.web.servlet.MockMvc;
  * {@link AutoConfigureMockMvc @AutoConfigureMockMvc} annotation can be used.
  * <p>
  * Typically {@code @WebMvcTest} is used in combination with
- * {@link org.springframework.boot.test.mock.mockito.MockBean @MockBean} or
- * {@link Import @Import} to create any collaborators required by your {@code @Controller}
- * beans.
+ * {@link org.springframework.test.context.bean.override.mockito.MockitoBean @MockitoBean}
+ * or {@link Import @Import} to create any collaborators required by your
+ * {@code @Controller} beans.
  * <p>
  * If you are looking to load your full application configuration and use MockMVC, you
  * should consider {@link SpringBootTest @SpringBootTest} combined with

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/webservices/server/WebServiceServerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,8 +51,8 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
  * </ul>
  * <p>
  * Typically {@code WebServiceServerTest} is used in combination with
- * {@link org.springframework.boot.test.mock.mockito.MockBean @MockBean} or
- * {@link org.springframework.context.annotation.Import @Import} to create any
+ * {@link org.springframework.test.context.bean.override.mockito.MockitoBean @MockitoBean}
+ * or {@link org.springframework.context.annotation.Import @Import} to create any
  * collaborators required by your {@code Endpoint} beans.
  * <p>
  * If you are looking to load your full application configuration and use