Merge branch '6.1.x'

# Conflicts:
#	spring-context/src/main/java/org/springframework/context/aot/AbstractAotProcessor.java

Author: jhoeller

spring-aop/src/main/java/org/springframework/aop/framework/Advised.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -56,9 +56,9 @@ public interface Advised extends TargetClassAware {
 
 	/**
 	 * Determine whether the given interface is proxied.
-	 * @param intf the interface to check
+	 * @param ifc the interface to check
 	 */
-	boolean isInterfaceProxied(Class<?> intf);
+	boolean isInterfaceProxied(Class<?> ifc);
 
 	/**
 	 * Change the {@code TargetSource} used by this {@code Advised} object.

spring-context/src/main/java/org/springframework/context/support/PostProcessorRegistrationDelegate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -437,8 +437,9 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
 					logger.warn("Bean '" + beanName + "' of type [" + bean.getClass().getName() +
 							"] is not eligible for getting processed by all BeanPostProcessors " +
 							"(for example: not eligible for auto-proxying). Is this bean getting eagerly " +
-							"injected into a currently created BeanPostProcessor " + bppsInCreation + "? " +
-							"Check the corresponding BeanPostProcessor declaration and its dependencies.");
+							"injected/applied to a currently created BeanPostProcessor " + bppsInCreation + "? " +
+							"Check the corresponding BeanPostProcessor declaration and its dependencies/advisors. " +
+							"If this bean does not have to be post-processed, declare it with ROLE_INFRASTRUCTURE.");
 				}
 			}
 			return bean;

spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml

@@ -11,7 +11,7 @@
 	</description>
 
 	<bean id="aapc" class="org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator">
-		<!-- This common interceptor will be applied always, before custom lockable advisor -->
+		<!-- This common interceptor will be applied before the custom lockable advisor -->
 		<property name="interceptorNames">
 			<value>nopInterceptor</value>
 		</property>
@@ -44,4 +44,3 @@
 	<bean id="packageVisibleMethod" class="org.springframework.aop.framework.autoproxy.PackageVisibleMethod"/>
 
 </beans>
-