Sam Brannen 2af08cf163 Merge branch '5.3.x' ... # Conflicts: # spring-core/src/test/java/org/springframework/core/annotation/TypeMappedAnnotationTests.java # spring-test/src/test/java/org/springframework/test/context/junit4/TimedSpringRunnerTests.java # spring-test/src/test/java/org/springframework/test/util/MetaAnnotationUtilsTests.java # spring-test/src/test/java/org/springframework/test/util/OverriddenMetaAnnotationAttributesTests.java		2022-07-09 16:24:04 +02:00
..
src	Merge branch '5.3.x'	2022-07-09 16:24:04 +02:00
spring-beans.gradle	Update bean registration contribution tests to use TestCompiler	2022-03-10 16:06:52 +01:00