Merge branch '6.2.x'

2025-03-18 16:42:37 +01:00
parent 69ed984a81 c6a9aa59a3
commit e05d4f2f18
37 changed files with 109 additions and 119 deletions
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/AsyncExecutionInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/AsyncExecutionInterceptorTests.java
@@ -27,13 +27,12 @@ import org.mockito.ArgumentCaptor;
 import org.springframework.core.task.AsyncTaskExecutor;

 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;

-
 /**
 * Tests for {@link AsyncExecutionInterceptor}.
 *