Sam Brannen ddd11610cf Merge branch '5.3.x' ...

# Conflicts:
#	spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
#	spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java

2022-07-13 13:46:34 +02:00

..

java/org/springframework/oxm

Merge branch '5.3.x'

2022-07-13 13:46:34 +02:00

resources

Merge branch '5.1.x'

2019-05-07 13:03:45 +02:00