Juergen Hoeller a34f1e3759 Merge branch '5.2.x' ...

# Conflicts:
#	build.gradle
#	spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java
#	spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/MockServerHttpRequest.java
#	spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java

2020-06-06 18:52:51 +02:00

..

src

Merge branch '5.2.x'

2020-06-06 18:52:51 +02:00

spring-web.gradle

Add dependency on BouncyCastle for JDK 15+

2020-05-25 17:30:27 +02:00