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

# Conflicts:
#	spring-test/src/main/java/org/springframework/test/context/cache/DefaultCacheAwareContextLoaderDelegate.java

2023-06-11 15:56:23 +02:00

..

src

Merge branch '6.0.x'

2023-06-11 15:56:23 +02:00

.springBeans

Support classes AND locations in @ContextConfiguration

2014-04-01 19:45:56 +02:00

spring-test.gradle

Merge branch '6.0.x'

2023-06-09 11:52:20 +02:00