Juergen Hoeller 97efacc9a4 Merge branch '5.2.x' ...

# Conflicts:
#	spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerAspect.aj

2020-06-23 12:01:24 +02:00

..

src

Merge branch '5.2.x'

2020-06-23 12:01:24 +02:00

spring-aspects.gradle

Remove unnecessary dependency on spring-orm

2020-02-17 20:54:58 +01:00