WFLY-10327 Upgrade Hibernate ORM to 5.3.0.Final and Hibernate Search …

…to 5.10.0.CR1, squashed commits/changes from Sanne, Paul, Gail
wildfly · May 16, 2018 · 9e0bd05 · 9e0bd05
1 parent 0cb4ab3
commit 9e0bd05
Show file tree

Hide file tree

Showing 131 changed files with 6,136 additions and 516 deletions.
diff --git a/feature-pack/pom.xml b/feature-pack/pom.xml
@@ -897,6 +897,17 @@
             </exclusions>
         </dependency>
 
+       <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>jipijapa-hibernate5-3</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>jipijapa-hibernate5</artifactId>
@@ -907,11 +918,17 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>jipijapa-hibernate5-legacy</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>jipijapa-hibernate5-3-legacy</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>jipijapa-hibernate4-3</artifactId>
@@ -2035,6 +2052,11 @@
             <artifactId>jettison</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
@@ -2080,8 +2102,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.infinispan</groupId>
-            <artifactId>hibernate-infinispan</artifactId>
+            <artifactId>infinispan-hibernate-cache-v53</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
@@ -111,6 +111,17 @@
         </license>
       </licenses>
     </dependency>
+    <dependency>
+      <groupId>net.bytebuddy</groupId>
+      <artifactId>byte-buddy</artifactId>
+      <licenses>
+        <license>
+          <name>Apache License 2.0</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+          <distribution>repo</distribution>
+        </license>
+      </licenses>
+    </dependency>
     <dependency>
       <groupId>com.github.ben-manes.caffeine</groupId>
       <artifactId>caffeine</artifactId>

diff --git a/feature-pack/src/main/resources/modules/system/layers/base/net/bytebuddy/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/net/bytebuddy/main/module.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2018, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<module xmlns="urn:jboss:module:1.5" name="net.bytebuddy">
+    <properties>
+        <property name="jboss.api" value="private"/>
+    </properties>
+
+    <resources>
+        <artifact name="${net.bytebuddy:byte-buddy}"/>
+    </resources>
+
+    <dependencies>
+        <module name="sun.jdk"/>
+    </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/lucene/5.5/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/lucene/5.5/module.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2018, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<module xmlns="urn:jboss:module:1.7" name="org.apache.lucene:5.5">
+    <properties>
+        <property name="jboss.api" value="private"/>
+    </properties>
+
+    <resources>
+        <artifact name="org.apache.lucene:lucene-analyzers-common:5.5.5"/>
+        <artifact name="org.apache.lucene:lucene-core:5.5.5"/>
+        <artifact name="org.apache.lucene:lucene-facet:5.5.5"/>
+        <artifact name="org.apache.lucene:lucene-queries:5.5.5"/>
+        <artifact name="org.apache.lucene:lucene-queryparser:5.5.5"/>
+        <artifact name="org.apache.lucene:lucene-grouping:5.5.5"/>
+    </resources>
+
+    <dependencies>
+        <module name="javax.api"/>
+        <module name="org.apache.lucene.internal:5.5" optional="true" services="import"/>
+    </dependencies>
+</module>
diff --git a/...k/src/main/resources/modules/system/layers/base/org/apache/lucene/internal/5.5/module.xml b/...k/src/main/resources/modules/system/layers/base/org/apache/lucene/internal/5.5/module.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2018, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<module xmlns="urn:jboss:module:1.7" name="org.apache.lucene.internal:5.5">
+    <properties>
+        <property name="jboss.api" value="private"/>
+    </properties>
+
+    <resources>
+        <artifact name="org.apache.lucene:lucene-misc:5.5.5"/>
+        <artifact name="org.apache.lucene:lucene-backward-codecs:5.5.5"/>
+    </resources>
+
+    <dependencies>
+        <module name="javax.api"/>
+        <module name="org.apache.lucene:5.5"/>
+    </dependencies>
+</module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/4.1/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/4.1/module.xml
@@ -39,7 +39,6 @@
         <module name="org.antlr"/>
         <module name="org.apache.commons.collections"/>
         <module name="org.dom4j"/>
-        <module name="org.infinispan" services="import"/>
         <module name="org.javassist" export="true"/>
         <module name="org.jboss.as.jpa.spi"/>
         <module name="org.jboss.jandex"/>

diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/4.3/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/4.3/module.xml
@@ -38,7 +38,6 @@
         <module name="javax.xml.bind.api"/>
         <module name="org.antlr"/>
         <module name="org.dom4j"/>
-        <module name="org.infinispan" services="import"/>
         <module name="org.javassist" export="true"/>
         <module name="org.jboss.as.jpa.spi"/>
         <module name="org.jboss.jandex"/>

diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/5.0/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/5.0/module.xml
@@ -22,6 +22,6 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<!-- Represents the Hibernate 5.0.x module-->
+<!-- Represents the Hibernate 5.1.x module-->
 <module-alias xmlns="urn:jboss:module:1.5" name="org.hibernate" slot="5.0"  target-name="org.hibernate"/>
 
diff --git a/.../resources/modules/system/layers/base/org/hibernate/jipijapa-hibernate4-3/main/module.xml b/.../resources/modules/system/layers/base/org/hibernate/jipijapa-hibernate4-3/main/module.xml
@@ -45,7 +45,5 @@
         <module name="org.jboss.logging"/>
         <module name="org.jboss.vfs"/>
         <module name="org.hibernate.commons-annotations"/>
-        <module name="org.hibernate.infinispan" services="import"/>
-        <module name="org.infinispan" services="import"/>
     </dependencies>
 </module>
diff --git a/...in/resources/modules/system/layers/base/org/hibernate/jipijapa-hibernate5/main/module.xml b/...in/resources/modules/system/layers/base/org/hibernate/jipijapa-hibernate5/main/module.xml
@@ -22,14 +22,33 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.5" name="org.hibernate.jipijapa-hibernate5">
+<module xmlns="urn:jboss:module:1.7" name="org.hibernate.jipijapa-hibernate5">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
 
     <resources>
-        <artifact name="${org.wildfly:jipijapa-hibernate5}"/>
+        <artifact name="${org.wildfly:jipijapa-hibernate5}">
-        <artifact name="${org.wildfly:jipijapa-hibernate5-legacy}"/>
+            <conditions>
+              <property-not-equal name="ee8.preview.mode" value="true"/>
+            </conditions>
+        </artifact>
+        <artifact name="${org.wildfly:jipijapa-hibernate5-3}">
+            <conditions>
+              <property-equal name="ee8.preview.mode" value="true"/>
+            </conditions>
+        </artifact>
+
+        <artifact name="${org.wildfly:jipijapa-hibernate5-legacy}">
+            <conditions>
+              <property-not-equal name="ee8.preview.mode" value="true"/>
+            </conditions>
+        </artifact>
+        <artifact name="${org.wildfly:jipijapa-hibernate5-3-legacy}">
+            <conditions>
+              <property-equal name="ee8.preview.mode" value="true"/>
+            </conditions>
+        </artifact>
     </resources>
 
     <dependencies>

diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/main/module.xml
@@ -22,13 +22,42 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<!-- Represents the Hibernate 5.0.x module-->
+<!-- Represents Hibernate 5.1.x, will later become 5.3.x for WF 14  -->
-<module xmlns="urn:jboss:module:1.5" name="org.hibernate">
+<module xmlns="urn:jboss:module:1.7" name="org.hibernate">
     <resources>
-        <artifact name="${org.hibernate:hibernate-core}"/>
+        <artifact name="${org.hibernate:hibernate-core}">
-        <artifact name="${org.hibernate:hibernate-envers}"/>
+            <conditions>
-        <artifact name="${org.hibernate:hibernate-entitymanager}"/>
+              <property-equal name="ee8.preview.mode" value="true"/>
-        <artifact name="${org.hibernate:hibernate-java8}"/>
+            </conditions>
+        </artifact>
+        <artifact name="org.hibernate:hibernate-core:5.1.14.Final"> <!-- ${version.org.hibernate51} -->
+            <conditions>
+              <property-not-equal name="ee8.preview.mode" value="true"/>
+            </conditions>
+        </artifact>
+        <artifact name="${org.hibernate:hibernate-envers}">
+            <conditions>
+              <property-equal name="ee8.preview.mode" value="true"/>
+            </conditions>
+        </artifact>
+        <artifact name="org.hibernate:hibernate-envers:5.1.14.Final"> <!-- ${version.org.hibernate51} -->
+            <conditions>
+              <property-not-equal name="ee8.preview.mode" value="true"/>
+            </conditions>
+        </artifact>
+
+        <artifact name="org.hibernate:hibernate-entitymanager:5.1.14.Final"> <!-- ${version.org.hibernate51} -->
+            <conditions>
+              <property-not-equal name="ee8.preview.mode" value="true"/>
+            </conditions>
+        </artifact>    
+
+        <artifact name="org.hibernate:hibernate-java8:5.1.14.Final"> <!-- ${version.org.hibernate51} -->
+            <conditions>
+              <property-not-equal name="ee8.preview.mode" value="true"/>
+            </conditions>
+        </artifact>
+
     </resources>
 
     <dependencies>
@@ -50,5 +79,6 @@
         <module name="org.hibernate.commons-annotations"/>
         <module name="org.hibernate.jipijapa-hibernate5" services="import"/>
         <module name="org.infinispan.hibernate-cache" services="import" optional="true"/>
+        <module name="net.bytebuddy"/>
     </dependencies>
 </module>
diff --git a/...ain/resources/modules/system/layers/base/org/hibernate/search/backend-jms/5.10/module.xml b/...ain/resources/modules/system/layers/base/org/hibernate/search/backend-jms/5.10/module.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2018, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<module xmlns="urn:jboss:module:1.7" name="org.hibernate.search.backend-jms:5.10">
+    <properties>
+        <property name="jboss.api" value="private"/>
+    </properties>
+    <resources>
+        <artifact name="org.hibernate:hibernate-search-backend-jms:5.10.0.CR1"/>
+    </resources>
+    <dependencies>
+        <module name="org.hibernate.search.engine:5.10"/>
+        <module name="org.jboss.logging"/>
+        <module name="javax.jms.api"/>
+        <module name="org.jboss.as.naming"/>
+        <module name="javax.api"/>
+    </dependencies>
+</module>