From f0218e82adaf96fb5b20017a6845d0fabecfb5dc Mon Sep 17 00:00:00 2001
From: Andrea Boriero <andrea@hibernate.org>
Date: Tue, 10 Sep 2019 15:51:11 +0100
Subject: [PATCH] HHH-13616 Enable the hibernate-orm-modules test for JDK 11

---
 build.gradle                                  |   2 +-
 gradle/libraries.gradle                       |   6 +++---
 gradle/wrapper/gradle-wrapper.jar             | Bin 56172 -> 56177 bytes
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 .../hibernate-orm-modules.gradle              |   9 ++++-----
 .../HibernateEnversOnWildflyTest.java         |   2 ++
 .../HibernateModulesOnWildflyTest.java        |   2 ++
 .../TransactionRollbackTest.java              |   1 +
 .../AuditedEntity.java                        |   2 +-
 .../Kryptonite.java                           |   2 +-
 10 files changed, 16 insertions(+), 12 deletions(-)
 rename hibernate-orm-modules/src/test/java/org/hibernate/wildfly/{integrationtest => model}/AuditedEntity.java (96%)
 rename hibernate-orm-modules/src/test/java/org/hibernate/wildfly/{integrationtest => model}/Kryptonite.java (90%)

diff --git a/build.gradle b/build.gradle
index 2416a7aedf..7eb33121c9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -86,7 +86,7 @@ task ciBuild {
 
 
 wrapper {
-	gradleVersion = '4.10.2'
+	gradleVersion = '4.10.3'
 	distributionType = Wrapper.DistributionType.ALL
 }
 
diff --git a/gradle/libraries.gradle b/gradle/libraries.gradle
index 4fbbdce617..98fa8af98c 100644
--- a/gradle/libraries.gradle
+++ b/gradle/libraries.gradle
@@ -28,11 +28,11 @@ ext {
     geolatteVersion = '1.4.0'
 
     // Wildfly version targeted by module ZIP; Arquillian/Shrinkwrap versions used for CDI testing and testing the module ZIP
-    wildflyVersion = '14.0.1.Final'
-    arquillianVersion = '1.4.0.Final'
+    wildflyVersion = '17.0.1.Final'
+    arquillianVersion = '1.4.1.Final'
     shrinkwrapVersion = '1.2.6'
     shrinkwrapDescriptorsVersion = '2.0.0'
-    wildflyArquillianContainerVersion = '2.1.1.Final'
+    wildflyArquillianContainerVersion = '2.2.0.Final'
 
     jodaTimeVersion = '2.3'
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 28861d273a5d270fd8f65dd74570c17c9c507736..94336fcae912db8a11d55634156fa011f4686124 100644
GIT binary patch
delta 692
zcmYk4T}V@59LD$ljeUf+K{mFtg;7@>Yq^4!Io(R7$e0sDrO<X2A-hq!l4258>|(Ka
zAd0cFi^%R0#%_X^!lG@SxeqtD^>I-IyO3~nThQ_4w0z<4{+{1+&VfJgyA^L~#9P7+
zoxbn&+<BEsHU7wbMJLqFzh)b=OcfTEWA;>g?vz^P9nxt3WZr!<$}hFc56<PS*q`qF
z|0OP@M_Ck+w4JR$N}pj{Xqb$!W<=^>crP8mWM+UC)f}^G13t>lf<}otyw#W>u8H(R
zrzkB>XN?H12~;&TmELSbw`4$F)+saBX6X`@56Ni3ywt}cNJ!)K*~Yu$*>3u9g5w<-
z?>RV1SqC+SICfla<^Nmq7+U4Aloj>xGP~Y}ipPY|x=1g*is~iR1V`J%LAY`v*(Q0M
z&kfLCpMn~=eEYDS6IlS3yqA52KkuZrX)OEAa7_#Nk{9WTUyi*p8ZcH6*fq=)rdR{H
z!WfO*LcU-{y=sN8DA0>Jj8u-`dC|^7$QN&tBf!PfhLeun<(SwQq|kkiM@z%hALJMa
zTJf-KK&m8AJj|80JV-Hc+{R8TQsS`^)%adMOQomHcyY6bijij2SJa4Yc2V)!F6CxP
zcq`YL6>lnjy82444#QpTV*Qw@j?%&^qN_G|iw5ke3AB{NO47-P_SXb<8xLwX*f4(9
XPFi-~FVnxH;QJzaK6R>pr*^_$Jgg(_

delta 717
zcmYk4Ur19?9LMkZS<acsP1@M5%jPDOS8y5P!VDL*q9!&dF^D93=nwg#L=aj_ABw~W
z<y+B~+BOWKhe84aDJ`R7)9L=XbbHWxDhR=#?4{^<GW0xsKHu*-m-D-v<&ms!BUwFm
zt-EjKZmlFq4ZV(&o9V~*R@VEvaQH<<s6dk3E=|s++vDf9^Pa1O#jpv6aM}7H)P+wl
zAN=78Hime3ANz`BvmV8hDw!Bqt`2Udpq*=fHrE|^H@TNOGy-2~jId3q^jXW*iW?kL
z2GM+&a?pDtM;(eH$0%VI=!qPn2i7&r#$seY&6gu!*CXGS&yUMU+T=Wb&9(K`#!D0a
z*mAHkCnGSeP^X<o7A#DwwB!<BGS5_zuO4sQ7G&xTcoLTpoKYy~=Fx8aO3C=i^>?G#
zyeoQy%FYN}jB3ywJwTeXYg)_NVUD?31}(7~mW!vcCc4**XE7rp%_VTfRXWvzWv>Z{
zAEc#Lfi>}+*p^VJ{)*6}i7GaLn~4VMYU6<wQ*8<sk}{m0je}KsM0wRyAO@@Ml(+n!
zS&~ZOPhO&~TVhN3>~V735g433OwW4+ZcRC97#vG+J>{U6_XU1QRa4x{u^LSuRf;|o
zsi7|q<EuLGPao-_&Z#sJz^6bZ#%5*s<`gmx^45yegGC~`IJEJ)jYGV&z&XE%9Ha10
zSm5Q@F~PB1{BUhrVUJOgzQC@bJAIz&Lbx0%hAtx)ZhU=)^&vU+!;vY=UJ0#+e*s)7
B6KDVc

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d76b502e22..ae45383b6d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/hibernate-orm-modules/hibernate-orm-modules.gradle b/hibernate-orm-modules/hibernate-orm-modules.gradle
index 4d78ba2992..b4f865936d 100644
--- a/hibernate-orm-modules/hibernate-orm-modules.gradle
+++ b/hibernate-orm-modules/hibernate-orm-modules.gradle
@@ -39,11 +39,6 @@ ext {
 	fpackStagingDir = file( "target/featurepack" ) //Target build directory for the Feature Pack
 }
 
-if ( JavaVersion.current().isJava11Compatible() ) {
-	logger.warn( '[WARN] Skipping all tests for hibernate-orm-modules due to Gradle issues with JDK 11' )
-	test.enabled = false
-}
-
 description = "Feature Pack of Hibernate ORM modules for WildFly ${project.wildFlyMajorVersion}"
 
 configurations {
@@ -144,6 +139,10 @@ task prepareWildFlyForTests( dependsOn: [provision] ) {
 	description = 'Downloads the WildFly distribution, installs it into a local directory, includes present version of Hibernate ORM, JPA 2.2 : ready for integration tests'
 }
 
+test {
+	exclude 'org/hibernate/wildfly/model/**'
+}
+
 
 test.dependsOn prepareWildFlyForTests
 
diff --git a/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/HibernateEnversOnWildflyTest.java b/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/HibernateEnversOnWildflyTest.java
index 05178337d4..b1f995cfce 100644
--- a/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/HibernateEnversOnWildflyTest.java
+++ b/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/HibernateEnversOnWildflyTest.java
@@ -16,6 +16,8 @@ import javax.transaction.UserTransaction;
 import org.hibernate.Session;
 import org.hibernate.envers.AuditReader;
 import org.hibernate.envers.AuditReaderFactory;
+import org.hibernate.wildfly.model.AuditedEntity;
+
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
diff --git a/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/HibernateModulesOnWildflyTest.java b/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/HibernateModulesOnWildflyTest.java
index f35dd758ed..99ff429b88 100644
--- a/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/HibernateModulesOnWildflyTest.java
+++ b/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/HibernateModulesOnWildflyTest.java
@@ -13,6 +13,8 @@ import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
 import org.hibernate.Session;
+import org.hibernate.wildfly.model.Kryptonite;
+
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
diff --git a/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/TransactionRollbackTest.java b/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/TransactionRollbackTest.java
index dd57243050..6f4123451d 100644
--- a/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/TransactionRollbackTest.java
+++ b/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/TransactionRollbackTest.java
@@ -12,6 +12,7 @@ import javax.persistence.PersistenceContext;
 
 import org.hibernate.Session;
 import org.hibernate.engine.transaction.spi.TransactionImplementor;
+import org.hibernate.wildfly.model.Kryptonite;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/AuditedEntity.java b/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/model/AuditedEntity.java
similarity index 96%
rename from hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/AuditedEntity.java
rename to hibernate-orm-modules/src/test/java/org/hibernate/wildfly/model/AuditedEntity.java
index 00a974b7c8..0d6f48950a 100644
--- a/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/AuditedEntity.java
+++ b/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/model/AuditedEntity.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.wildfly.integrationtest;
+package org.hibernate.wildfly.model;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
diff --git a/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/Kryptonite.java b/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/model/Kryptonite.java
similarity index 90%
rename from hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/Kryptonite.java
rename to hibernate-orm-modules/src/test/java/org/hibernate/wildfly/model/Kryptonite.java
index 7b073fe6f3..3ab61e224b 100644
--- a/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/Kryptonite.java
+++ b/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/model/Kryptonite.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.wildfly.integrationtest;
+package org.hibernate.wildfly.model;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;