Remove org.spockframework excludes and exclude org.apache.groovy on grails-gradle-plugins

Author: jamesfredley

grails-gradle/plugins/build.gradle

@@ -34,13 +34,12 @@ dependencies {
     // see: https://docs.gradle.org/current/userguide/compatibility.html#groovy
     compileOnly "org.codehaus.groovy:groovy"
 
-    implementation project(':grails-gradle-tasks')
-
-    implementation project(':grails-gradle-model'), {
+    implementation project(':grails-gradle-tasks'), {
         exclude group: 'org.apache.groovy'
-        exclude group: 'org.spockframework'
     }
 
+    implementation project(':grails-gradle-model')
+
     implementation 'io.github.gradle-nexus:publish-plugin'
     implementation 'org.springframework.boot:spring-boot-gradle-plugin'
     implementation 'org.springframework.boot:spring-boot-loader-tools'

grails-gradle/tasks/build.gradle

@@ -31,9 +31,7 @@ dependencies {
 
     implementation "org.apache.groovy:groovy:${bomDependencyVersions['groovy.version']}"
 
-    implementation project(':grails-gradle-model'), {
-        exclude group: 'org.spockframework'
-    }
+    implementation project(':grails-gradle-model')
 
     implementation 'io.github.gradle-nexus:publish-plugin'
     implementation 'org.springframework.boot:spring-boot-gradle-plugin'