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		2022-03-18 16:47:12 +01:00
..
src	Merge branch '5.3.x'	2022-03-18 16:47:12 +01:00
spring-tx.gradle	Upgrade to Groovy 4.0	2022-02-04 21:01:02 +01:00