Juergen Hoeller 89d563097f Merge branch '6.1.x' ...

# Conflicts:
#	spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java

2024-03-16 23:24:51 +01:00

..

src

Merge branch '6.1.x'

2024-03-16 23:24:51 +01:00

.springBeans

Support classes AND locations in @ContextConfiguration

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

spring-test.gradle

Add support for JSON assertions using JSON compare

2024-03-15 13:28:11 +01:00