From c826b524b6ef78afbf5f415fa870c1a37e1c80fe Mon Sep 17 00:00:00 2001 From: Puneet Behl Date: Tue, 29 Mar 2022 10:21:44 +0530 Subject: [PATCH] Revert "Remove unnecessary test dependencies from build (#12390)" This reverts commit ca01dbe2 --- build.gradle | 4 ++-- .../support/GroovyConsoleWebApplicationContext.groovy | 2 ++ grails-core/build.gradle | 2 +- grails-plugin-controllers/build.gradle | 2 -- grails-plugin-i18n/build.gradle | 2 ++ grails-plugin-interceptors/build.gradle | 2 -- grails-plugin-mimetypes/build.gradle | 2 -- grails-plugin-url-mappings/build.gradle | 1 + grails-test/build.gradle | 5 +---- grails-web-common/build.gradle | 2 -- .../src/main/groovy/grails/util/GrailsWebMockUtil.groovy | 0 grails-web/build.gradle | 2 -- 12 files changed, 9 insertions(+), 17 deletions(-) rename {grails-test => grails-web-common}/src/main/groovy/grails/util/GrailsWebMockUtil.groovy (100%) diff --git a/build.gradle b/build.gradle index 8c3e7532990..5477ae97acc 100644 --- a/build.gradle +++ b/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' } } diff --git a/grails-console/src/main/groovy/grails/ui/console/support/GroovyConsoleWebApplicationContext.groovy b/grails-console/src/main/groovy/grails/ui/console/support/GroovyConsoleWebApplicationContext.groovy index 443fe24207d..447490f56ef 100644 --- a/grails-console/src/main/groovy/grails/ui/console/support/GroovyConsoleWebApplicationContext.groovy +++ b/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 /* diff --git a/grails-core/build.gradle b/grails-core/build.gradle index deba8d53d61..cd5625026a5 100644 --- a/grails-core/build.gradle +++ b/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") diff --git a/grails-plugin-controllers/build.gradle b/grails-plugin-controllers/build.gradle index be8958b238c..16cef8bcbcf 100644 --- a/grails-plugin-controllers/build.gradle +++ b/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" } diff --git a/grails-plugin-i18n/build.gradle b/grails-plugin-i18n/build.gradle index ad0652c9e3b..ed85b98a1a2 100644 --- a/grails-plugin-i18n/build.gradle +++ b/grails-plugin-i18n/build.gradle @@ -1,3 +1,5 @@ dependencies { api project(":grails-web") + + api "org.codehaus.groovy:groovy-ant:$groovyVersion" } diff --git a/grails-plugin-interceptors/build.gradle b/grails-plugin-interceptors/build.gradle index b2f39a5cd9e..438e3f86cbf 100644 --- a/grails-plugin-interceptors/build.gradle +++ b/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") } diff --git a/grails-plugin-mimetypes/build.gradle b/grails-plugin-mimetypes/build.gradle index 856f2ec8a69..03f8fe84bd7 100644 --- a/grails-plugin-mimetypes/build.gradle +++ b/grails-plugin-mimetypes/build.gradle @@ -10,6 +10,4 @@ dependencies { compileOnly "io.micronaut:micronaut-runtime:$micronautVersion" api project(":grails-web") - - testImplementation project(":grails-test") } diff --git a/grails-plugin-url-mappings/build.gradle b/grails-plugin-url-mappings/build.gradle index 0f77839fda4..3ca2a784c45 100644 --- a/grails-plugin-url-mappings/build.gradle +++ b/grails-plugin-url-mappings/build.gradle @@ -1,3 +1,4 @@ dependencies { api project(":grails-web"), project(":grails-plugin-controllers") + api "junit:junit:${junitVersion}" } diff --git a/grails-test/build.gradle b/grails-test/build.gradle index e1da55b9574..e3a12034be6 100644 --- a/grails-test/build.gradle +++ b/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' - } } diff --git a/grails-web-common/build.gradle b/grails-web-common/build.gradle index 9e055a14009..c8a5903b507 100644 --- a/grails-web-common/build.gradle +++ b/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") } diff --git a/grails-test/src/main/groovy/grails/util/GrailsWebMockUtil.groovy b/grails-web-common/src/main/groovy/grails/util/GrailsWebMockUtil.groovy similarity index 100% rename from grails-test/src/main/groovy/grails/util/GrailsWebMockUtil.groovy rename to grails-web-common/src/main/groovy/grails/util/GrailsWebMockUtil.groovy diff --git a/grails-web/build.gradle b/grails-web/build.gradle index 36de5f17267..6897bbaba71 100644 --- a/grails-web/build.gradle +++ b/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") }