From 6108c7d2fab12a95e374ea95316ec8e16e0cf37e Mon Sep 17 00:00:00 2001
From: Steve Ebersole <steve@hibernate.org>
Date: Sat, 14 Mar 2020 09:17:57 -0500
Subject: [PATCH] ORM 6 - re-enable hibernate-orm-modules module

cleanup
---
 gradle/libraries.gradle                       |  3 ++-
 .../hibernate-orm-modules.gradle              |  8 +++----
 .../module-templates/antlr.xml                | 22 -------------------
 .../{antrl-runtime.xml => antlr4-runtime.xml} | 11 ++++++----
 .../module-templates/hibernate-core.xml       |  3 +--
 5 files changed, 14 insertions(+), 33 deletions(-)
 delete mode 100644 hibernate-orm-modules/module-templates/antlr.xml
 rename hibernate-orm-modules/module-templates/{antrl-runtime.xml => antlr4-runtime.xml} (66%)

diff --git a/gradle/libraries.gradle b/gradle/libraries.gradle
index ae1522d6a1..f080e142f6 100644
--- a/gradle/libraries.gradle
+++ b/gradle/libraries.gradle
@@ -58,7 +58,8 @@ ext {
             ant:            'org.apache.ant:ant:1.8.2',
 
             // Antlr
-            antlr:          "org.antlr:antlr4:${antlrVersion}",
+            antlr:           "org.antlr:antlr4:${antlrVersion}",
+            antlr4_runtime:  "org.antlr:antlr4-runtime:${antlrVersion}",
 
             // Annotations
             commons_annotations: "org.hibernate.common:hibernate-commons-annotations:${hibernateCommonsVersion}",
diff --git a/hibernate-orm-modules/hibernate-orm-modules.gradle b/hibernate-orm-modules/hibernate-orm-modules.gradle
index cb11a27896..b7f737ea2d 100644
--- a/hibernate-orm-modules/hibernate-orm-modules.gradle
+++ b/hibernate-orm-modules/hibernate-orm-modules.gradle
@@ -22,8 +22,8 @@ apply from: rootProject.file( 'gradle/publishing-pom.gradle' )
 apply plugin: 'build-dashboard'
 apply plugin: 'project-report'
 
-project.tasks.jar.enabled = false
-project.tasks.javadoc.enabled = false
+//project.tasks.jar.enabled = false
+//project.tasks.javadoc.enabled = false
 
 evaluationDependsOn( ':hibernate-core' )
 evaluationDependsOn( ':hibernate-envers' )
@@ -118,7 +118,7 @@ dependencies {
 	testCompile libraries.wildfly_arquillian_container_managed
 
 	featurePack libraries.byteBuddy
-	featurePack libraries.antlr
+	featurePack libraries.antlr4_runtime
 	featurePack project( ":hibernate-core" )
 	featurePack project( ":hibernate-envers" )
 	featurePack "org.wildfly:jipijapa-hibernate5:${wildflyVersion}"
@@ -152,7 +152,7 @@ test {
 
 
 test.dependsOn prepareWildFlyForTests
-test.ignoreFailures = true
+//test.ignoreFailures = true
 
 processTestResources {
 	expand(
diff --git a/hibernate-orm-modules/module-templates/antlr.xml b/hibernate-orm-modules/module-templates/antlr.xml
deleted file mode 100644
index 8392abcfc3..0000000000
--- a/hibernate-orm-modules/module-templates/antlr.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Hibernate, Relational Persistence for Idiomatic Java
-  ~
-  ~ 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>.
-  -->
-<module xmlns="urn:jboss:module:1.3" name="org.antlr" slot="${antlrSlot}">
-    <properties>
-        <property name="jboss.api" value="private"/>
-    </properties>
-
-    <resources>
-        <artifact name="${org.antlr:antlr4}"/>
-    </resources>
-    <dependencies>
-        <module name="org.antlr-runtime" slot="${antlrSlot}" />
-    </dependencies>
-<!--    <dependencies>-->
-<!--        &lt;!&ndash; ByteBuddy currently uses sun.misc.Unsafe &ndash;&gt;-->
-<!--        <module name="sun.jdk"/>-->
-</module>
\ No newline at end of file
diff --git a/hibernate-orm-modules/module-templates/antrl-runtime.xml b/hibernate-orm-modules/module-templates/antlr4-runtime.xml
similarity index 66%
rename from hibernate-orm-modules/module-templates/antrl-runtime.xml
rename to hibernate-orm-modules/module-templates/antlr4-runtime.xml
index c54c9c2208..56b32ba9cb 100644
--- a/hibernate-orm-modules/module-templates/antrl-runtime.xml
+++ b/hibernate-orm-modules/module-templates/antlr4-runtime.xml
@@ -5,7 +5,12 @@
   ~ 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>.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.antlr-runtime" slot="${antlrSlot}">
+<module xmlns="urn:jboss:module:1.3" name="org.antlr.antlr4-runtime" slot="${antlrSlot}">
+
+    <!--
+        Module for the Antlr 4 runtime jar
+    -->
+
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
@@ -13,7 +18,5 @@
     <resources>
         <artifact name="${org.antlr:antlr4-runtime}"/>
     </resources>
-    <!--    <dependencies>-->
-    <!--        &lt;!&ndash; ByteBuddy currently uses sun.misc.Unsafe &ndash;&gt;-->
-    <!--        <module name="sun.jdk"/>-->
+
 </module>
\ No newline at end of file
diff --git a/hibernate-orm-modules/module-templates/hibernate-core.xml b/hibernate-orm-modules/module-templates/hibernate-core.xml
index b1f402a87b..b465e5f3aa 100644
--- a/hibernate-orm-modules/module-templates/hibernate-core.xml
+++ b/hibernate-orm-modules/module-templates/hibernate-core.xml
@@ -20,8 +20,7 @@
         <module name="javax.transaction.api"/>
         <module name="javax.validation.api"/>
         <module name="javax.xml.bind.api"/>
-        <module name="org.antlr" slot="${antlrSlot}"/>
-        <module name="org.antlr-runtime" slot="${antlrSlot}"/>
+        <module name="org.antlr.antlr4-runtime" slot="${antlrSlot}"/>
         <module name="org.dom4j"/>
         <module name="org.jboss.as.jpa.spi"/>
         <module name="org.jboss.jandex"/>