HHH-13616 Enable the hibernate-orm-modules test for JDK 11

build.gradle

@@ -86,7 +86,7 @@ task ciBuild {
 
 
 wrapper {
-	gradleVersion = '4.10.2'
+	gradleVersion = '4.10.3'
 	distributionType = Wrapper.DistributionType.ALL
 }
 

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'
 

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

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
 

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;

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;

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;

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;

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;