From 6c7bd0e8b6cfaabee2e86b962c8005768411b6ba Mon Sep 17 00:00:00 2001
From: Christoph Strobl <christoph.strobl@broadcom.com>
Date: Thu, 19 Dec 2024 08:46:59 +0100
Subject: [PATCH] Switch XML persistence & orm files to version 3.2

See: #3673
Original Pull Request: #3695
---
 spring-data-jpa/src/test/resources/META-INF/orm.xml       | 8 ++++----
 .../src/test/resources/META-INF/persistence-jmh.xml       | 7 ++++---
 .../src/test/resources/META-INF/persistence.xml           | 5 ++++-
 .../src/test/resources/META-INF/persistence2.xml          | 7 ++++---
 .../org/springframework/data/jpa/support/mapping.xml      | 5 ++++-
 .../data/jpa/support/module1/module1-orm.xml              | 6 ++++--
 .../data/jpa/support/module2/module2-orm.xml              | 6 ++++--
 .../org/springframework/data/jpa/support/persistence.xml  | 5 ++++-
 .../org/springframework/data/jpa/support/persistence2.xml | 5 ++++-
 .../resources/simple-persistence/simple-persistence.xml   | 5 ++++-
 10 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/spring-data-jpa/src/test/resources/META-INF/orm.xml b/spring-data-jpa/src/test/resources/META-INF/orm.xml
index 820a9cced2..65f0ef28fe 100644
--- a/spring-data-jpa/src/test/resources/META-INF/orm.xml
+++ b/spring-data-jpa/src/test/resources/META-INF/orm.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm https://java.sun.com/xml/ns/persistence/orm_2_0.xsd"
-	version="2.0">
+<entity-mappings xmlns="https://jakarta.ee/xml/ns/persistence/orm"
+				 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+				 xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence/orm https://jakarta.ee/xml/ns/persistence/orm/orm_3_2.xsd"
+				 version="3.2">
 
 	<persistence-unit-metadata>
 		<persistence-unit-defaults>
diff --git a/spring-data-jpa/src/test/resources/META-INF/persistence-jmh.xml b/spring-data-jpa/src/test/resources/META-INF/persistence-jmh.xml
index 60c6b5c97a..a78eb59468 100644
--- a/spring-data-jpa/src/test/resources/META-INF/persistence-jmh.xml
+++ b/spring-data-jpa/src/test/resources/META-INF/persistence-jmh.xml
@@ -14,9 +14,10 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence https://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
+			 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			 xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_2.xsd"
+			 version="3.2">
 	<persistence-unit name="benchmark">
 		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
 		<class>org.springframework.data.jpa.domain.AbstractPersistable</class>
diff --git a/spring-data-jpa/src/test/resources/META-INF/persistence.xml b/spring-data-jpa/src/test/resources/META-INF/persistence.xml
index 4f904373c3..35a8715991 100644
--- a/spring-data-jpa/src/test/resources/META-INF/persistence.xml
+++ b/spring-data-jpa/src/test/resources/META-INF/persistence.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence https://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
+			 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			 xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_2.xsd"
+			 version="3.2">
 	<persistence-unit name="spring-data-jpa">
 		<class>org.springframework.data.jpa.domain.AbstractPersistable</class>
 		<class>org.springframework.data.jpa.domain.AbstractAuditable</class>
diff --git a/spring-data-jpa/src/test/resources/META-INF/persistence2.xml b/spring-data-jpa/src/test/resources/META-INF/persistence2.xml
index f4f7adb6b2..a93617de58 100644
--- a/spring-data-jpa/src/test/resources/META-INF/persistence2.xml
+++ b/spring-data-jpa/src/test/resources/META-INF/persistence2.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.0"
-	xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence https://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
+			 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			 xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_2.xsd"
+			 version="3.2">
 	<persistence-unit name="first">
 		<class>org.springframework.data.jpa.domain.sample.AnnotatedAuditableUser</class>
 		<class>org.springframework.data.jpa.domain.sample.AuditableRole</class>
diff --git a/spring-data-jpa/src/test/resources/org/springframework/data/jpa/support/mapping.xml b/spring-data-jpa/src/test/resources/org/springframework/data/jpa/support/mapping.xml
index 87f3460858..634c42b966 100644
--- a/spring-data-jpa/src/test/resources/org/springframework/data/jpa/support/mapping.xml
+++ b/spring-data-jpa/src/test/resources/org/springframework/data/jpa/support/mapping.xml
@@ -1,2 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" />
+<entity-mappings xmlns="https://jakarta.ee/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                 xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence/orm https://jakarta.ee/xml/ns/persistence/orm/orm_3_2.xsd"
+                 version="3.2" />
diff --git a/spring-data-jpa/src/test/resources/org/springframework/data/jpa/support/module1/module1-orm.xml b/spring-data-jpa/src/test/resources/org/springframework/data/jpa/support/module1/module1-orm.xml
index da1ce9a7d4..634c42b966 100644
--- a/spring-data-jpa/src/test/resources/org/springframework/data/jpa/support/module1/module1-orm.xml
+++ b/spring-data-jpa/src/test/resources/org/springframework/data/jpa/support/module1/module1-orm.xml
@@ -1,3 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm https://java.sun.com/xml/ns/persistence/orm_2_0.xsd" version="2.0">
-</entity-mappings>
+<entity-mappings xmlns="https://jakarta.ee/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                 xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence/orm https://jakarta.ee/xml/ns/persistence/orm/orm_3_2.xsd"
+                 version="3.2" />
diff --git a/spring-data-jpa/src/test/resources/org/springframework/data/jpa/support/module2/module2-orm.xml b/spring-data-jpa/src/test/resources/org/springframework/data/jpa/support/module2/module2-orm.xml
index da1ce9a7d4..634c42b966 100644
--- a/spring-data-jpa/src/test/resources/org/springframework/data/jpa/support/module2/module2-orm.xml
+++ b/spring-data-jpa/src/test/resources/org/springframework/data/jpa/support/module2/module2-orm.xml
@@ -1,3 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm https://java.sun.com/xml/ns/persistence/orm_2_0.xsd" version="2.0">
-</entity-mappings>
+<entity-mappings xmlns="https://jakarta.ee/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                 xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence/orm https://jakarta.ee/xml/ns/persistence/orm/orm_3_2.xsd"
+                 version="3.2" />
diff --git a/spring-data-jpa/src/test/resources/org/springframework/data/jpa/support/persistence.xml b/spring-data-jpa/src/test/resources/org/springframework/data/jpa/support/persistence.xml
index ad1460bad7..f75fea5ba3 100644
--- a/spring-data-jpa/src/test/resources/org/springframework/data/jpa/support/persistence.xml
+++ b/spring-data-jpa/src/test/resources/org/springframework/data/jpa/support/persistence.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence https://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
+			 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			 xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_2.xsd"
+			 version="3.2">
 	<persistence-unit name="pu">
 		<mapping-file>foo.xml</mapping-file>
 		<class>org.springframework.data.jpa.domain.sample.User</class>
diff --git a/spring-data-jpa/src/test/resources/org/springframework/data/jpa/support/persistence2.xml b/spring-data-jpa/src/test/resources/org/springframework/data/jpa/support/persistence2.xml
index 962748440b..1666022d07 100644
--- a/spring-data-jpa/src/test/resources/org/springframework/data/jpa/support/persistence2.xml
+++ b/spring-data-jpa/src/test/resources/org/springframework/data/jpa/support/persistence2.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence https://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
+			 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			 xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_2.xsd"
+			 version="3.2">
 	<persistence-unit name="pu">
 		<mapping-file>bar.xml</mapping-file>
 		<class>org.springframework.data.jpa.domain.sample.Role</class>
diff --git a/spring-data-jpa/src/test/resources/simple-persistence/simple-persistence.xml b/spring-data-jpa/src/test/resources/simple-persistence/simple-persistence.xml
index 9caa71259a..706d5fb919 100644
--- a/spring-data-jpa/src/test/resources/simple-persistence/simple-persistence.xml
+++ b/spring-data-jpa/src/test/resources/simple-persistence/simple-persistence.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence https://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
+			 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			 xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_2.xsd"
+			 version="3.2">
 
 	<persistence-unit name="xxx">
 		<exclude-unlisted-classes>true</exclude-unlisted-classes>