Juergen Hoeller 5bf213948c Merge branch '6.0.x' ...

# Conflicts:
#	spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringBeanContainer.java

2023-06-17 11:41:07 +02:00

..

main

Merge branch '6.0.x'

2023-06-17 11:41:07 +02:00

test

Merge branch '6.0.x'

2023-06-03 17:19:06 +02:00