Juergen Hoeller 45c20e34e4 Merge branch '6.0.x' ...

# Conflicts:
#	spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java

2023-08-14 19:29:14 +02:00

..

src

Merge branch '6.0.x'

2023-08-14 19:29:14 +02:00

spring-context-support.gradle

Consistent dependency declarations

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