Juergen Hoeller dc6c96de0a Merge branch '6.1.x' ...

# Conflicts:
#	spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractFallbackJCacheOperationSource.java
#	spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java
#	spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java

2024-03-04 22:50:22 +01:00

..

java

Merge branch '6.1.x'

2024-03-04 22:50:22 +01:00

kotlin/org/springframework/aop

Spring cleaning: update copyright headers

2024-02-23 12:21:22 +01:00

resources

Delete unused XML config in AOP namespace tests

2022-01-26 12:15:10 +01:00