You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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
|
6 years ago |
| .. |
|
src
|
Add blank line between java and javax imports
|
6 years ago |
|
spring-aspects.gradle
|
Merge branch '5.1.x'
|
6 years ago |