Juergen Hoeller 69d5587f53 Merge branch '6.1.x' ...

# Conflicts:
#	spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java

2024-08-31 12:04:29 +02:00

..

jmh/java/org/springframework/context

Update copyright headers

2023-12-12 14:51:03 +01:00

main

Merge branch '6.1.x'

2024-08-31 12:04:29 +02:00

test

Reject method name mismatch in case of bean name overloading

2024-08-13 18:22:34 +02:00

testFixtures/java/org/springframework/context/testfixture

Introduce ReflectiveScan

2024-07-08 11:11:48 +02:00