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.
Sam Brannen
b570f60560
Merge branch '5.3.x'
# Conflicts:
# spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java
# spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java
# spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java
# spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java
# spring-beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java
# spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
# spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedNotification.java
# spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameter.java
# spring-core/src/main/java/org/springframework/javapoet/support/package-info.java
# spring-core/src/main/java/org/springframework/util/TypeUtils.java
# spring-web/src/main/java/org/springframework/http/HttpMethod.java
|
4 years ago |
| .. |
|
src
|
Merge branch '5.3.x'
|
4 years ago |
|
spring-oxm.gradle
|
Ensure projects can be imported into Eclipse IDE with JDK 17
|
4 years ago |