Juergen Hoeller 064cd3b7af Merge branch '6.0.x' ...

# Conflicts:
#	gradle.properties
#	spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java

2023-07-14 12:18:41 +02:00

..

src

Merge branch '6.0.x'

2023-07-14 12:18:41 +02:00

spring-jdbc.gradle

Upgrade to Derby 10.16

2022-10-18 18:29:15 +02:00