Skip to content

Commit 5c205e3

Browse files
Switch XML persistence & orm files to version 3.2
See: #3673 Original Pull Request: #3695
1 parent f04be06 commit 5c205e3

File tree

10 files changed

+40
-19
lines changed

10 files changed

+40
-19
lines changed

spring-data-jpa/src/test/resources/META-INF/orm.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm https://java.sun.com/xml/ns/persistence/orm_2_0.xsd"
5-
version="2.0">
2+
<entity-mappings xmlns="https://jakarta.ee/xml/ns/persistence/orm"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence/orm https://jakarta.ee/xml/ns/persistence/orm/orm_3_2.xsd"
5+
version="3.2">
66

77
<persistence-unit-metadata>
88
<persistence-unit-defaults>

spring-data-jpa/src/test/resources/META-INF/persistence-jmh.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
~ See the License for the specific language governing permissions and
1515
~ limitations under the License.
1616
-->
17-
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence"
18-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19-
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence https://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
17+
<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
18+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_2.xsd"
20+
version="3.2">
2021
<persistence-unit name="benchmark">
2122
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
2223
<class>org.springframework.data.jpa.domain.AbstractPersistable</class>

spring-data-jpa/src/test/resources/META-INF/persistence.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_2.xsd"
5+
version="3.2">
36
<persistence-unit name="spring-data-jpa">
47
<class>org.springframework.data.jpa.domain.AbstractPersistable</class>
58
<class>org.springframework.data.jpa.domain.AbstractAuditable</class>

spring-data-jpa/src/test/resources/META-INF/persistence2.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<persistence version="2.0"
3-
xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence https://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
2+
<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_2.xsd"
5+
version="3.2">
56
<persistence-unit name="first">
67
<class>org.springframework.data.jpa.domain.sample.AnnotatedAuditableUser</class>
78
<class>org.springframework.data.jpa.domain.sample.AuditableRole</class>
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" />
2+
<entity-mappings xmlns="https://jakarta.ee/xml/ns/persistence/orm"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence/orm https://jakarta.ee/xml/ns/persistence/orm/orm_3_2.xsd"
5+
version="3.2" />
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
3-
</entity-mappings>
2+
<entity-mappings xmlns="https://jakarta.ee/xml/ns/persistence/orm"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence/orm https://jakarta.ee/xml/ns/persistence/orm/orm_3_2.xsd"
5+
version="3.2" />
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
3-
</entity-mappings>
2+
<entity-mappings xmlns="https://jakarta.ee/xml/ns/persistence/orm"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence/orm https://jakarta.ee/xml/ns/persistence/orm/orm_3_2.xsd"
5+
version="3.2" />

spring-data-jpa/src/test/resources/org/springframework/data/jpa/support/persistence.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_2.xsd"
5+
version="3.2">
36
<persistence-unit name="pu">
47
<mapping-file>foo.xml</mapping-file>
58
<class>org.springframework.data.jpa.domain.sample.User</class>

spring-data-jpa/src/test/resources/org/springframework/data/jpa/support/persistence2.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_2.xsd"
5+
version="3.2">
36
<persistence-unit name="pu">
47
<mapping-file>bar.xml</mapping-file>
58
<class>org.springframework.data.jpa.domain.sample.Role</class>

spring-data-jpa/src/test/resources/simple-persistence/simple-persistence.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_2.xsd"
5+
version="3.2">
36

47
<persistence-unit name="xxx">
58
<exclude-unlisted-classes>true</exclude-unlisted-classes>

0 commit comments

Comments
 (0)