Sam Brannen 9764f0e59b Merge branch '5.3.x' ... # Conflicts: # spring-test/src/test/java/org/springframework/mock/http/server/reactive/MockServerHttpRequestTests.java # spring-web/src/test/java/org/springframework/http/server/reactive/HeadersAdaptersTests.java # spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java # spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java # spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java # spring-webmvc/src/test/java/org/springframework/web/servlet/handler/MappedInterceptorTests.java # spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java # spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java		2022-03-16 15:07:53 +01:00
..
src	Merge branch '5.3.x'	2022-03-16 15:07:53 +01:00
spring-webmvc.gradle	Upgrade to Groovy 4.0	2022-02-04 21:01:02 +01:00