mirror of
https://github.com/spring-projects/spring-framework.git
synced 2026-09-17 16:39:29 +00:00
# Conflicts: # spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java # spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java