diff --git a/build.gradle b/build.gradle
index 1a5cffa9..ba0e62e6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -155,6 +155,12 @@ subprojects { project ->
         }
     }
 
+    configurations.create('documentation') {
+        attributes {
+            attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, Usage.JAVA_RUNTIME))
+        }
+    }
+
     if(isPluginProject) {
         group "org.grails.plugins"
         version( rootProject.version - '.RELEASE' )
@@ -214,10 +220,6 @@ subprojects { project ->
         }
     }
 
-    configurations {
-        documentation
-    }
-
     dependencies {
         api "org.codehaus.groovy:groovy:$groovyVersion"
         api "org.codehaus.groovy:groovy-templates:$groovyVersion"
diff --git a/gradle.properties b/gradle.properties
index f3f4a527..eb4c4b8d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,7 +7,7 @@ geckodriverVersion=0.23.0
 groovyVersion=3.0.7
 h2Version=1.4.200
 hibernateCoreVersion=5.4.0.Final
-hibernatePluginVersion=7.1.0.BUILD-SNAPSHOT
+hibernatePluginVersion=7.1.0.M4
 hibernateValidatorVersion=6.0.13.Final
 jansiVersion=1.18
 javaParserCoreVersion=3.15.14
diff --git a/grails-plugin/build.gradle b/grails-plugin/build.gradle
index d8a6a4df..6e5e6d01 100644
--- a/grails-plugin/build.gradle
+++ b/grails-plugin/build.gradle
@@ -22,9 +22,7 @@ configurations.all {
     }
 }
 dependencies {
-    documentation ("org.grails:grails-core")
-    documentation ("org.grails:grails-spring")
-    compileOnly "org.grails:grails-core:"
+    compileOnly "org.grails:grails-core"
     compileOnly "org.grails:grails-bootstrap"
     compileOnly "org.grails:grails-test-mixins:3.3.0"
     compileOnly 'javax.servlet:javax.servlet-api:4.0.1'