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

..

main

Merge branch '6.0.x'

2023-06-20 17:42:40 +02:00

test

Remove unused test code and polish

2023-06-25 15:31:15 +02:00

testFixtures/java/org/springframework/aop/testfixture

Update copyright headers

2023-03-13 21:53:40 +01:00