Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

Browse Source 
# Conflicts:
#	spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringBeanContainer.java
This commit is contained in:
Juergen Hoeller
2023-06-17 11:41:07 +02:00
parent 92c2fb45c7 dff7aa4d4b
commit 5bf213948c
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml
View File

@@ -172,7 +172,7 @@
<value>2601,2627</value>
</property>
<property name="dataIntegrityViolationCodes">
<value>544,8114,8115</value>
<value>544,2628,8114,8115</value>
</property>
<property name="dataAccessResourceFailureCodes">
<value>4060</value>