HHH-8700 - Update ORM modules using JPA metamodel generator to use the new module

build.gradle

@@ -101,9 +101,6 @@ subprojects { subProject ->
             jbossLoggingTool {
                 description = "Dependencies for running the JBoss logging AnnotationProcessor tool"
             }
-            hibernateJpaModelGenTool {
-                description = "Dependencies for running the Hibernate JPA Metamodel Generator AnnotationProcessor tool"
-            }
             jaxb {
                 description = 'Dependencies for running ant xjc (jaxb class generation)'
             }
@@ -130,8 +127,6 @@ subprojects { subProject ->
 
             jbossLoggingTool( libraries.logging_processor )
 
-            hibernateJpaModelGenTool( libraries.jpa_modelgen )
-
             jaxb( libraries.jaxb ){
                 exclude group: "javax.xml.stream"
             }

hibernate-entitymanager/hibernate-entitymanager.gradle

@@ -2,6 +2,12 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 apply plugin: 'hibernate-matrix-testing'
 
+configurations {
+    hibernateJpaModelGenTool {
+        description = "Dependencies for running the Hibernate JPA Metamodel Generator AnnotationProcessor tool"
+    }
+}
+
 dependencies {
     compile( project(':hibernate-core') )
     compile( libraries.dom4j )
@@ -25,6 +31,8 @@ dependencies {
 
     // for testing stored procedure support
     testCompile( libraries.derby )
+
+    hibernateJpaModelGenTool( project( ':hibernate-jpamodelgen' ) )
 }
 
 def pomName() {

hibernate-envers/hibernate-envers.gradle

@@ -1,5 +1,11 @@
 apply plugin: 'hibernate-matrix-testing'
 
+configurations {
+    hibernateJpaModelGenTool {
+        description = "Dependencies for running the Hibernate JPA Metamodel Generator AnnotationProcessor tool"
+    }
+}
+
 dependencies {
     compile( project( ':hibernate-core' ) )
     compile( project( ':hibernate-entitymanager' ) )
@@ -8,6 +14,8 @@ dependencies {
     testCompile( project(':hibernate-testing') )
     testCompile( project(path: ':hibernate-entitymanager', configuration: 'tests') )
     testRuntime( libraries.javassist )
+
+    hibernateJpaModelGenTool( project( ':hibernate-jpamodelgen' ) )
 }
 
 def pomName() {

libraries.gradle

@@ -87,7 +87,6 @@ ext {
             byteman:         "org.jboss.byteman:byteman:${bytemanVersion}",
             byteman_install: "org.jboss.byteman:byteman-install:${bytemanVersion}",
             byteman_bmunit:  "org.jboss.byteman:byteman-bmunit:${bytemanVersion}",
-            jpa_modelgen:    'org.hibernate:hibernate-jpamodelgen:1.1.1.Final',
             shrinkwrap_api:  'org.jboss.shrinkwrap:shrinkwrap-api:1.0.0-beta-6',
             shrinkwrap:      'org.jboss.shrinkwrap:shrinkwrap-impl-base:1.0.0-beta-6',
             validator:       'org.hibernate:hibernate-validator:5.0.1.Final',