Juergen Hoeller 3804b1c602 Merge branch '6.0.x' ... # Conflicts: # spring-context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java # spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java # spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/R2dbcTransactionManagerUnitTests.java		2023-08-06 14:26:55 +02:00
..
main	Assert SimpleTriggerFactoryBean.setMisfireInstruction() values	2023-07-31 16:08:47 +03:00
test	Merge branch '6.0.x'	2023-08-06 14:26:55 +02:00
testFixtures/java/org/springframework/contextsupport/testfixture	Update copyright headers	2023-01-19 16:20:03 +01:00