From c52645905a5c91f8abf56f644b029467c135820e Mon Sep 17 00:00:00 2001
From: "ralph.riedel" <2551355+ralph-riedel@users.noreply.github.com>
Date: Tue, 3 Oct 2023 19:31:12 +0200
Subject: [PATCH 1/2] Use schema-based config in sql-error-codes.xml

This commit replaces the reference to the beans DTD in
sql-error-codes.xml with the preferred schema-based configuration
approach.

See gh-31354
---
 .../org/springframework/jdbc/support/sql-error-codes.xml     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml b/spring-jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml
index 2bb0e58b654..94483ca3a64 100644
--- a/spring-jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml
+++ b/spring-jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
 
 <!--
 	- Default SQL error codes for well-known databases.
@@ -12,7 +11,9 @@
 	- If this property is present, then it will be used instead of the id for
 	- looking up the error codes based on the current database.
 	-->
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="DB2" name="Db2" class="org.springframework.jdbc.support.SQLErrorCodes">
 		<property name="databaseProductName">

From 61f27dafee9637da4fab9758408ee49f505bc1de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= <snicoll@vmware.com>
Date: Wed, 4 Oct 2023 13:12:56 +0200
Subject: [PATCH 2/2] Polish "Use schema-based config in sql-error-codes.xml"

See gh-31354
---
 .../org/springframework/jdbc/support/sql-error-codes.xml      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml b/spring-jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml
index 94483ca3a64..e8c892d07ad 100644
--- a/spring-jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml
+++ b/spring-jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
 	- Default SQL error codes for well-known databases.
 	- Can be overridden by definitions in a "sql-error-codes.xml" file
@@ -13,7 +12,8 @@
 	-->
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans
+	   https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="DB2" name="Db2" class="org.springframework.jdbc.support.SQLErrorCodes">
 		<property name="databaseProductName">