Sam Brannen 466dd825ac Merge branch '5.3.x' ...

# Conflicts:
#	spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java
#	spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
#	spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
#	spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java

2022-03-01 16:48:24 +01:00

..

jmh/java/org/springframework/context

Early removal of 5.x-deprecated code

2021-11-18 09:18:06 +01:00

main

Merge branch '5.3.x'

2022-02-24 14:50:18 +01:00

test

Merge branch '5.3.x'

2022-03-01 16:48:24 +01:00

testFixtures/java/org/springframework/context/testfixture

Merge branch '5.3.x'

2022-02-03 14:58:36 +01:00