ORM 6 - re-enable hibernate-orm-modules module

cleanup
hibernate · Mar 16, 2020 · 6108c7d · 6108c7d
1 parent 5999d80
commit 6108c7d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 33 deletions.
diff --git 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
@@ -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
diff --git a/...odules/module-templates/antrl-runtime.xml → ...dules/module-templates/antlr4-runtime.xml b/...odules/module-templates/antrl-runtime.xml → ...dules/module-templates/antlr4-runtime.xml
@@ -5,15 +5,18 @@
   ~ 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>
 
     <resources>
         <artifact name="${org.antlr:antlr4-runtime}"/>
     </resources>
-    <!--    <dependencies>-->
-    <!--        &lt;!&ndash; ByteBuddy currently uses sun.misc.Unsafe &ndash;&gt;-->
-    <!--        <module name="sun.jdk"/>-->
+
 </module>
diff --git 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"/>