Sam Brannen 9127777c32 Merge branch '6.0.x' ...

# Conflicts:
#	spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java

2023-06-25 15:34:10 +02:00

..

src

Merge branch '6.0.x'

2023-06-25 15:34:10 +02:00

.springBeans

…

spring-context.gradle

Merge branch '6.0.x'

2023-06-21 14:22:11 +02:00