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

..

java/org/springframework

Merge branch '5.2.x'

2020-06-11 23:53:27 +02:00

kotlin/org/springframework

Support noarg callable references in Kotlin beans DSL

2020-01-13 10:53:23 +01:00

resources

Merge branch '5.1.x'

2019-05-07 13:03:45 +02:00