mirror of
https://github.com/spring-projects/spring-framework
synced 2026-06-08 17:33:33 +00:00
edc14c2e15
# Conflicts: # spring-context-indexer/src/main/java/org/springframework/context/index/processor/StandardStereotypesProvider.java # spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java # spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java