From b610e786fb8845f139bbbbcff111fbaa7bd3ff76 Mon Sep 17 00:00:00 2001 From: Scott Marlow Date: Mon, 5 Mar 2018 16:01:48 -0500 Subject: [PATCH] WFLY-6464 JPA 2.2 container support (Hibernate ORM 5.3 will be separate pr) --- appclient/pom.xml | 4 ++-- ejb3/pom.xml | 4 ++-- feature-pack/pom.xml | 4 ++-- .../src/license/full-feature-pack-licenses.xml | 4 ++-- .../base/javax/persistence/api/main/module.xml | 13 +++++++++++-- jpa/hibernate5/pom.xml | 4 ++-- jpa/spi/pom.xml | 4 ++-- .../as/jpa/puparser/PersistenceUnitXmlParser.java | 2 ++ .../java/org/jboss/as/jpa/puparser/Version.java | 3 ++- pom.xml | 8 ++++---- spec-api/pom.xml | 4 ++-- .../integration/jpa/basic/SLSBPersistenceUnits.java | 8 +++----- .../multiplepersistenceunittest/persistence.xml | 2 +- 13 files changed, 37 insertions(+), 27 deletions(-) diff --git a/appclient/pom.xml b/appclient/pom.xml index dc424bbb8908..7dbbb13bc496 100644 --- a/appclient/pom.xml +++ b/appclient/pom.xml @@ -83,8 +83,8 @@ - org.hibernate.javax.persistence - hibernate-jpa-2.1-api + javax.persistence + javax.persistence-api diff --git a/ejb3/pom.xml b/ejb3/pom.xml index 02cdff4e8cff..77e6fc93cc18 100644 --- a/ejb3/pom.xml +++ b/ejb3/pom.xml @@ -120,8 +120,8 @@ vi:ts=4:sw=4:expandtab - org.hibernate.javax.persistence - hibernate-jpa-2.1-api + javax.persistence + javax.persistence-api diff --git a/feature-pack/pom.xml b/feature-pack/pom.xml index 1db6d583ba52..db949117fdba 100644 --- a/feature-pack/pom.xml +++ b/feature-pack/pom.xml @@ -2176,8 +2176,8 @@ - org.hibernate.javax.persistence - hibernate-jpa-2.1-api + javax.persistence + javax.persistence-api * diff --git a/feature-pack/src/license/full-feature-pack-licenses.xml b/feature-pack/src/license/full-feature-pack-licenses.xml index 40f0da5b43dd..3f9c47f1e8ac 100644 --- a/feature-pack/src/license/full-feature-pack-licenses.xml +++ b/feature-pack/src/license/full-feature-pack-licenses.xml @@ -1720,8 +1720,8 @@ - org.hibernate.javax.persistence - hibernate-jpa-2.1-api + javax.persistence + javax.persistence-api Eclipse Distribution License, Version 1.0 diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/persistence/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/persistence/api/main/module.xml index 32451b2f1533..999f4fbb99b0 100644 --- a/feature-pack/src/main/resources/modules/system/layers/base/javax/persistence/api/main/module.xml +++ b/feature-pack/src/main/resources/modules/system/layers/base/javax/persistence/api/main/module.xml @@ -22,13 +22,22 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> - + - + + + + + + + + + + diff --git a/jpa/hibernate5/pom.xml b/jpa/hibernate5/pom.xml index f81d8b13dd25..6fc91033016e 100644 --- a/jpa/hibernate5/pom.xml +++ b/jpa/hibernate5/pom.xml @@ -135,8 +135,8 @@ - org.hibernate.javax.persistence - hibernate-jpa-2.1-api + javax.persistence + javax.persistence-api diff --git a/jpa/spi/pom.xml b/jpa/spi/pom.xml index c77329078d26..cd307f73c4fd 100644 --- a/jpa/spi/pom.xml +++ b/jpa/spi/pom.xml @@ -51,8 +51,8 @@ - org.hibernate.javax.persistence - hibernate-jpa-2.1-api + javax.persistence + javax.persistence-api diff --git a/jpa/subsystem/src/main/java/org/jboss/as/jpa/puparser/PersistenceUnitXmlParser.java b/jpa/subsystem/src/main/java/org/jboss/as/jpa/puparser/PersistenceUnitXmlParser.java index 8fbd973523ed..f5a6541d94d9 100644 --- a/jpa/subsystem/src/main/java/org/jboss/as/jpa/puparser/PersistenceUnitXmlParser.java +++ b/jpa/subsystem/src/main/java/org/jboss/as/jpa/puparser/PersistenceUnitXmlParser.java @@ -90,6 +90,8 @@ public static PersistenceUnitMetadataHolder parse(final XMLStreamReader reader, version = Version.JPA_2_0; } else if ("2.1".equals(versionString)) { version = Version.JPA_2_1; + } else if ("2.2".equals(versionString)) { + version = Version.JPA_2_2; } else if ("2".equals(versionString)) { version = Version.JPA_2_0; } else { diff --git a/jpa/subsystem/src/main/java/org/jboss/as/jpa/puparser/Version.java b/jpa/subsystem/src/main/java/org/jboss/as/jpa/puparser/Version.java index e15a36ac123d..f52ece740968 100644 --- a/jpa/subsystem/src/main/java/org/jboss/as/jpa/puparser/Version.java +++ b/jpa/subsystem/src/main/java/org/jboss/as/jpa/puparser/Version.java @@ -33,7 +33,8 @@ public enum Version { UNKNOWN(null), JPA_1_0("http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"), JPA_2_0("http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"), - JPA_2_1("http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"); + JPA_2_1("http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"), + JPA_2_2("http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd"); private static final Map bindings = new HashMap(); diff --git a/pom.xml b/pom.xml index 1d94db6ee0bd..ca7b36885e7f 100644 --- a/pom.xml +++ b/pom.xml @@ -170,7 +170,7 @@ 5.0.2.Final 6.0.7.Final 5.3.6.Final - 1.0.2.Final + 2.2 5.5.8.Final 2.4.7.Final 9.2.0.Final @@ -4240,9 +4240,9 @@ - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - ${version.org.hibernate.javax.persistence.hibernate-jpa-2.1-api} + javax.persistence + javax.persistence-api + ${version.javax.persistence} diff --git a/spec-api/pom.xml b/spec-api/pom.xml index 2ad2223fb95c..0d14e5e30ae6 100644 --- a/spec-api/pom.xml +++ b/spec-api/pom.xml @@ -135,8 +135,8 @@ jboss-jaxws-api_2.2_spec - org.hibernate.javax.persistence - hibernate-jpa-2.1-api + javax.persistence + javax.persistence-api javax.enterprise diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/basic/SLSBPersistenceUnits.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/basic/SLSBPersistenceUnits.java index cc55b7da06c5..d11626b69df5 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/basic/SLSBPersistenceUnits.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/basic/SLSBPersistenceUnits.java @@ -28,7 +28,6 @@ import javax.ejb.Stateless; import javax.persistence.EntityManagerFactory; import javax.persistence.PersistenceUnit; -import javax.persistence.PersistenceUnits; /** * stateless session bean @@ -36,10 +35,9 @@ * @author Scott Marlow */ @Stateless -@PersistenceUnits({ - @PersistenceUnit(name = "pu1", unitName = "pu1"), - @PersistenceUnit(name = "pu2", unitName = "pu2") -}) +@PersistenceUnit(name = "pu1", unitName = "pu1") +@PersistenceUnit(name = "pu2", unitName = "pu2") + public class SLSBPersistenceUnits { @Resource diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/basic/multiplepersistenceunittest/persistence.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/basic/multiplepersistenceunittest/persistence.xml index 7e3e21f25bab..433ba9e6aab3 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/basic/multiplepersistenceunittest/persistence.xml +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jpa/basic/multiplepersistenceunittest/persistence.xml @@ -1,5 +1,5 @@ - + java:jboss/datasources/ExampleDS