Juergen Hoeller
bd70f10d2b
Merge branch '5.1.x'
# Conflicts:
# build.gradle
# spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java
# spring-aspects/spring-aspects.gradle
# spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
# spring-beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java
# spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
# spring-orm/spring-orm.gradle
# spring-test/spring-test.gradle