Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

Browse Source 
# Conflicts:
#	spring-context/src/main/java/org/springframework/context/aot/AbstractAotProcessor.java
This commit is contained in:
Juergen Hoeller
2024-09-27 19:17:32 +02:00
parent 8e3846991d 9f4968ed05
commit 56f3a48879
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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>