Sam Brannen 9350091163 Merge branch '6.0.x' ...

# Conflicts:
#	spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java
#	spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java

2023-09-20 17:06:35 +02:00

..

src

Merge branch '6.0.x'

2023-09-20 17:06:35 +02:00

spring-tx.gradle

Consistent dependency declarations

2023-08-02 00:56:50 +02:00