Sam Brannen 8d92c57777 Merge branch '5.3.x' ... # Conflicts: # spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java		2022-09-14 16:52:55 +02:00
..
main	Merge branch '5.3.x'	2022-09-14 16:52:55 +02:00
test/java/org/springframework/context/index	Merge branch '5.3.x'	2022-07-13 14:55:30 +02:00