WFLY-6464 JPA 2.2 container support (Hibernate ORM 5.3 will be separa…

…te pr)
wildfly · Mar 5, 2018 · b610e78 · b610e78
1 parent b22c399
commit b610e78
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 27 deletions.
diff --git a/appclient/pom.xml b/appclient/pom.xml
@@ -83,8 +83,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.1-api</artifactId>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
         </dependency>
 
         <dependency>

diff --git a/ejb3/pom.xml b/ejb3/pom.xml
@@ -120,8 +120,8 @@ vi:ts=4:sw=4:expandtab
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.1-api</artifactId>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
         </dependency>
 
         <dependency>

diff --git a/feature-pack/pom.xml b/feature-pack/pom.xml
@@ -2176,8 +2176,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.1-api</artifactId>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>

diff --git a/feature-pack/src/license/full-feature-pack-licenses.xml b/feature-pack/src/license/full-feature-pack-licenses.xml
@@ -1720,8 +1720,8 @@
       </licenses>
     </dependency>
     <dependency>
-      <groupId>org.hibernate.javax.persistence</groupId>
-      <artifactId>hibernate-jpa-2.1-api</artifactId>
+      <groupId>javax.persistence</groupId>
+      <artifactId>javax.persistence-api</artifactId>
       <licenses>
         <license>
           <name>Eclipse Distribution License, Version 1.0</name>

diff --git a/...-pack/src/main/resources/modules/system/layers/base/javax/persistence/api/main/module.xml b/...-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.
   -->
 
-<module xmlns="urn:jboss:module:1.5" name="javax.persistence.api">
+<module xmlns="urn:jboss:module:1.7" name="javax.persistence.api">
     <dependencies>
         <!-- PersistenceUnitInfo needs javax.sql.DataSource -->
         <module name="javax.api" export="true"/>
     </dependencies>
 
     <resources>
-        <artifact name="${org.hibernate.javax.persistence:hibernate-jpa-2.1-api}"/>
+        <artifact name="${javax.persistence:javax.persistence-api}">
+            <conditions>
+                <property-equal name="ee8.preview.mode" value="true" />
+            </conditions>
+        </artifact>
+        <artifact name="org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.2.Final">
+            <conditions>
+                <property-not-equal name="ee8.preview.mode" value="true" />
+            </conditions>
+        </artifact>
     </resources>
 </module>
diff --git a/jpa/hibernate5/pom.xml b/jpa/hibernate5/pom.xml
@@ -135,8 +135,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.1-api</artifactId>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
         </dependency>
 
         <dependency>

diff --git a/jpa/spi/pom.xml b/jpa/spi/pom.xml
@@ -51,8 +51,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.1-api</artifactId>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
         </dependency>
 
         <dependency>

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
@@ -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
@@ -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<String, Version> bindings = new HashMap<String, Version>();

diff --git a/pom.xml b/pom.xml
@@ -170,7 +170,7 @@
         <version.org.hibernate.commons.annotations>5.0.2.Final</version.org.hibernate.commons.annotations>
         <version.org.hibernate.validator>6.0.7.Final</version.org.hibernate.validator>
         <version.org.hibernate.validator.ee7>5.3.6.Final</version.org.hibernate.validator.ee7>
-        <version.org.hibernate.javax.persistence.hibernate-jpa-2.1-api>1.0.2.Final</version.org.hibernate.javax.persistence.hibernate-jpa-2.1-api>
+        <version.javax.persistence>2.2</version.javax.persistence>
         <version.org.hibernate.search>5.5.8.Final</version.org.hibernate.search>
         <version.org.hornetq>2.4.7.Final</version.org.hornetq>
         <version.org.infinispan>9.2.0.Final</version.org.infinispan>
@@ -4240,9 +4240,9 @@
             </dependency>
 
             <dependency>
-                <groupId>org.hibernate.javax.persistence</groupId>
-                <artifactId>hibernate-jpa-2.1-api</artifactId>
-                <version>${version.org.hibernate.javax.persistence.hibernate-jpa-2.1-api}</version>
+                <groupId>javax.persistence</groupId>
+                <artifactId>javax.persistence-api</artifactId>
+                <version>${version.javax.persistence}</version>
             </dependency>
 
             <dependency>

diff --git a/spec-api/pom.xml b/spec-api/pom.xml
@@ -135,8 +135,8 @@
       <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.hibernate.javax.persistence</groupId>
-      <artifactId>hibernate-jpa-2.1-api</artifactId>
+      <groupId>javax.persistence</groupId>
+      <artifactId>javax.persistence-api</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.enterprise</groupId>

diff --git a/...ion/basic/src/test/java/org/jboss/as/test/integration/jpa/basic/SLSBPersistenceUnits.java b/...ion/basic/src/test/java/org/jboss/as/test/integration/jpa/basic/SLSBPersistenceUnits.java
@@ -28,18 +28,16 @@
 import javax.ejb.Stateless;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceUnit;
-import javax.persistence.PersistenceUnits;
 
 /**
  * stateless session bean
  *
  * @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/.../java/org/jboss/as/test/integration/jpa/basic/multiplepersistenceunittest/persistence.xml b/.../java/org/jboss/as/test/integration/jpa/basic/multiplepersistenceunittest/persistence.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="2.0">
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="2.2">
     <persistence-unit name="pu1">
         <jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source>
         <properties>