Revert "Remove unnecessary test dependencies from build (#12390)"

This reverts commit ca01dbe

build.gradle

@@ -428,11 +428,11 @@ subprojects { project ->
     sourceCompatibility = "1.8"
     targetCompatibility = "1.8"
 
-    if(project.name =~ /^(grails-web|grails-plugin-|grails-test-suite)/) {
+    if(project.name =~ /^(grails-web|grails-plugin-|grails-test-suite|grails-test)/) {
         dependencies {
             api "javax.servlet:javax.servlet-api:$servletApiVersion"
             // MockHttpServletRequest/Response/Context used in many classes
-            testImplementation("org.springframework:spring-test:${springVersion}") {
+            api("org.springframework:spring-test:${springVersion}") {
                 exclude group: 'commons-logging', module:'commons-logging'
             }
         }

grails-console/src/main/groovy/grails/ui/console/support/GroovyConsoleWebApplicationContext.groovy

@@ -6,6 +6,8 @@ import grails.ui.support.DevelopmentWebApplicationContext
 import grails.util.BuildSettings
 import groovy.transform.CompileStatic
 import groovy.transform.InheritConstructors
+import org.springframework.mock.web.MockServletConfig
+import org.springframework.mock.web.MockServletContext
 import org.springframework.web.context.support.GenericWebApplicationContext
 
 /*

grails-core/build.gradle

@@ -36,7 +36,7 @@ dependencies {
         exclude group: 'commons-logging', module:'commons-logging'
     }
 
-    testImplementation("org.springframework:spring-test:${springVersion}") {
+    compileOnly("org.springframework:spring-test:${springVersion}") {
         exclude group: 'commons-logging', module:'commons-logging'
     }
     compileOnly("org.codehaus.groovy:groovy-templates:$groovyVersion")

grails-plugin-controllers/build.gradle

@@ -8,8 +8,6 @@ dependencies {
     api("org.springframework.boot:spring-boot-autoconfigure:$springBootVersion")
     runtimeOnly project(':grails-plugin-i18n')
 
-    testImplementation project(":grails-test")
-
     testRuntimeOnly "jline:jline:$jlineVersion"
     testRuntimeOnly "org.fusesource.jansi:jansi:$jansiVersion"
 }

grails-plugin-i18n/build.gradle

@@ -1,3 +1,5 @@
 dependencies {
     api project(":grails-web")
+
+    api "org.codehaus.groovy:groovy-ant:$groovyVersion"
 }

grails-plugin-interceptors/build.gradle

@@ -1,6 +1,4 @@
 dependencies {
     api project(":grails-plugin-controllers")
     api project(":grails-plugin-url-mappings")
-
-    testImplementation project(":grails-test")
 }

grails-plugin-mimetypes/build.gradle

@@ -10,6 +10,4 @@ dependencies {
     compileOnly "io.micronaut:micronaut-runtime:$micronautVersion"
 
     api project(":grails-web")
-
-    testImplementation project(":grails-test")
 }

grails-plugin-url-mappings/build.gradle

@@ -1,3 +1,4 @@
 dependencies {
     api project(":grails-web"), project(":grails-plugin-controllers")
+    api "junit:junit:${junitVersion}"
 }

grails-test/build.gradle

@@ -11,6 +11,7 @@ dependencies {
 
 
     api project(":grails-plugin-mimetypes")
+    api project(":grails-web")
     api "org.grails.plugins:converters:$legacyConvertersVersion"
 
     // command line requirements
@@ -23,8 +24,4 @@ dependencies {
 
     // needed for Spock
     api "org.objenesis:objenesis:${objenesisVersion}"
-
-    api("org.springframework:spring-test:${springVersion}") {
-        exclude group: 'commons-logging', module:'commons-logging'
-    }
 }

grails-web-common/build.gradle

@@ -14,6 +14,4 @@ dependencies {
     api "org.springframework:spring-webmvc:${springVersion}"
     api "org.springframework:spring-context-support:${springVersion}"
     implementation "com.github.ben-manes.caffeine:caffeine:$caffeineVersion"
-
-    testImplementation project(":grails-test")
 }

grails-web/build.gradle

@@ -16,6 +16,4 @@ dependencies {
         exclude group:'org.grails', module:'grails-encoder'
         exclude group:'org.grails', module:'grails-web-common'
     }
-
-    testImplementation project(":grails-test")
 }