Merge branch '6.1.x'

2024-09-04 17:30:49 +02:00
parent 2f56a59ba0 caaa86d6cf
commit 907859f2f3
2 changed files with 3 additions and 3 deletions
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
@@ -609,7 +609,7 @@ abstract class AbstractProxyTargetClassConfig {
 	@Aspect
 	static class SupplierAdvice {

-		@Around("execution(public * org.springframework.aop.aspectj.autoproxy..*.*(..))")
+		@Around("execution(* java.util.function.Supplier+.get())")
 		Object aroundSupplier(ProceedingJoinPoint joinPoint) throws Throwable {
 			return "advised: " + joinPoint.proceed();
 		}