Sam Brannen 5ae9217271 Merge branch '5.3.x' ... # Conflicts: # spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java # src/eclipse/org.eclipse.jdt.ui.prefs		2022-02-11 15:01:47 +01:00
..
src	Merge branch '5.3.x'	2022-02-11 15:01:47 +01:00
.springBeans	…
spring-test.gradle	Upgrade to Groovy 4.0	2022-02-04 21:01:02 +01:00