mirror of
https://github.com/spring-projects/spring-framework
synced 2026-06-08 17:33:33 +00:00
ddd11610cf
# Conflicts: # spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java # spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java