Juergen Hoeller 6c631e3d5c Merge branch '5.2.x' ... # Conflicts: # spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java		2020-09-25 11:36:18 +02:00
..
src	Merge branch '5.2.x'	2020-09-25 11:36:18 +02:00
spring-jms.gradle	Use Gradle test fixture support for spring-tx	2020-01-02 16:01:35 +01:00