Juergen Hoeller 7f43128a0e Merge branch '5.3.x' ...

# Conflicts:
#	build.gradle
#	spring-web/src/main/java/org/springframework/web/server/MediaTypeNotSupportedStatusException.java
#	spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
#	spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMappingIntrospector.java

2021-12-03 22:42:05 +01:00

..

src

Merge branch '5.3.x'

2021-12-03 22:42:05 +01:00

.springBeans

Support classes AND locations in @ContextConfiguration

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

spring-test.gradle

Merge branch '5.3.x'

2021-11-30 12:27:41 +01:00