Juergen Hoeller 1279b3b822 Merge branch '5.2.x' ... # Conflicts: # spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java # spring-context-support/src/main/java/org/springframework/cache/jcache/config/AbstractJCacheConfiguration.java		2020-06-11 23:53:27 +02:00
..
src	Merge branch '5.2.x'	2020-06-11 23:53:27 +02:00
spring-context-support.gradle	Use Gradle test fixture support for spring-tx	2020-01-02 16:01:35 +01:00