diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle
index 858ecc8d38..73eb870b47 100644
--- a/documentation/documentation.gradle
+++ b/documentation/documentation.gradle
@@ -40,7 +40,7 @@ dependencies {
 
 	compile( libraries.jpa )
 	compile( project( ':hibernate-core' ) )
-	compile( project( ':hibernate-jpamodelgen' ) )
+	annotationProcessor( project( ':hibernate-jpamodelgen' ) )
 
 	testCompile( 'org.apache.commons:commons-lang3:3.4' )
 
diff --git a/gradle/java-module.gradle b/gradle/java-module.gradle
index d7f08d9660..e29637c1cc 100644
--- a/gradle/java-module.gradle
+++ b/gradle/java-module.gradle
@@ -56,9 +56,6 @@ configurations {
 	provided {
 		description = 'Non-exported compile-time dependencies.'
 	}
-	jbossLoggingTool {
-		description = 'Dependencies for running the jboss-logging tooling.'
-	}
 	asciidoclet {
 		description = "Dependencies for Asciidoctor Javadoc taglet"
 	}
@@ -72,7 +69,9 @@ dependencies {
 
 	provided libraries.logging_annotations
 
-	jbossLoggingTool( libraries.logging_processor )
+	annotationProcessor( libraries.logging_processor )
+	annotationProcessor( libraries.logging )
+	annotationProcessor( libraries.logging_annotations )
 
 	testCompile( libraries.junit )
 	testCompile( libraries.byteman )
@@ -153,7 +152,6 @@ task compile(dependsOn: [compileJava, processResources, compileTestJava, process
 
 sourceSets.main {
 	compileClasspath += configurations.provided
-	compileClasspath += configurations.jbossLoggingTool
 }
 
 convention.findPlugin( JavaPluginConvention.class ).sourceSets.each { sourceSet ->
diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle
index faab42e095..212f9019c0 100644
--- a/hibernate-core/hibernate-core.gradle
+++ b/hibernate-core/hibernate-core.gradle
@@ -14,9 +14,6 @@ apply plugin: 'org.hibernate.build.gradle.xjc'
 description = 'Hibernate\'s core ORM functionality'
 
 configurations {
-    hibernateJpaModelGenTool {
-        description = "Dependencies for running the Hibernate JPA Metamodel Generator AnnotationProcessor tool"
-    }
     tests {
         description = 'Configuration for the produced test jar'
     }
@@ -94,7 +91,7 @@ dependencies {
     testRuntime( libraries.atomikos_jta )
     testRuntime(libraries.wildfly_transaction_client)
 
-	testCompile( project( ':hibernate-jpamodelgen' ) )
+    testAnnotationProcessor( project( ':hibernate-jpamodelgen' ) )
 
     testCompile libraries.arquillian_junit_container
     testCompile libraries.arquillian_protocol_servlet
diff --git a/hibernate-envers/hibernate-envers.gradle b/hibernate-envers/hibernate-envers.gradle
index 90c67c5dc8..ad98fd0286 100644
--- a/hibernate-envers/hibernate-envers.gradle
+++ b/hibernate-envers/hibernate-envers.gradle
@@ -17,7 +17,7 @@ dependencies {
     }
 
     provided( libraries.ant )
-    provided( project( ':hibernate-jpamodelgen' ) )
+    annotationProcessor( project( ':hibernate-jpamodelgen' ) )
 
     testCompile( project( ':hibernate-testing' ) )
     testCompile( project( path: ':hibernate-core', configuration: 'tests' ) )