diff --git a/spring-context/spring-context.gradle b/spring-context/spring-context.gradle
index 2e363c08a4..a0498224ba 100644
--- a/spring-context/spring-context.gradle
+++ b/spring-context/spring-context.gradle
@@ -23,9 +23,9 @@ dependencies {
 	optional("org.hibernate:hibernate-validator:5.4.2.Final")
 	optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
-	testCompile("org.codehaus.groovy:groovy-xml:${groovyVersion}")
 	testCompile("org.codehaus.groovy:groovy-jsr223:${groovyVersion}")
 	testCompile("org.codehaus.groovy:groovy-test:${groovyVersion}")
+	testCompile("org.codehaus.groovy:groovy-xml:${groovyVersion}")
 	testCompile("org.apache.commons:commons-pool2:2.6.0")
 	testCompile("javax.inject:javax.inject-tck:1")
 	testCompile("org.awaitility:awaitility:3.1.2")
diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle
index b1ba01a2dd..1798ad2c9b 100644
--- a/spring-test/spring-test.gradle
+++ b/spring-test/spring-test.gradle
@@ -32,7 +32,7 @@ dependencies {
 	optional("org.junit.jupiter:junit-jupiter-api")
 	optional("org.testng:testng:6.14.3")
 	optional("org.aspectj:aspectjweaver:${aspectjVersion}")
-	optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
+	optional("org.codehaus.groovy:groovy:${groovyVersion}")
 	optional("org.hamcrest:hamcrest-core:1.3")
 	optional("org.apache.taglibs:taglibs-standard-jstlel:1.2.5") {
 		exclude group: "org.apache.taglibs", module: "taglibs-standard-spec"
diff --git a/spring-tx/spring-tx.gradle b/spring-tx/spring-tx.gradle
index d8109fb0b3..093b9caad6 100644
--- a/spring-tx/spring-tx.gradle
+++ b/spring-tx/spring-tx.gradle
@@ -11,6 +11,6 @@ dependencies {
 	optional("javax.transaction:javax.transaction-api:1.3")
 	optional("com.ibm.websphere:uow:6.0.2.17")
 	testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
-	testCompile("org.codehaus.groovy:groovy-all:${groovyVersion}")
+	testCompile("org.codehaus.groovy:groovy:${groovyVersion}")
 	testCompile("org.eclipse.persistence:javax.persistence:2.2.0")
 }
diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle
index 695d0176f7..3c4d18f44e 100644
--- a/spring-web/spring-web.gradle
+++ b/spring-web/spring-web.gradle
@@ -60,7 +60,7 @@ dependencies {
 	optional("com.googlecode.protobuf-java-format:protobuf-java-format:1.4")
 	optional("com.rometools:rome:1.11.1")
 	optional("com.caucho:hessian:4.0.51")
-	optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
+	optional("org.codehaus.groovy:groovy:${groovyVersion}")
 	optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
 	testCompile("io.projectreactor:reactor-test")
diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle
index ce700b2aea..6e7963a3eb 100644
--- a/spring-webmvc/spring-webmvc.gradle
+++ b/spring-webmvc/spring-webmvc.gradle
@@ -39,7 +39,7 @@ dependencies {
 		exclude group: "org.springframework", module: "spring-web"
 		exclude group: "org.slf4j", module: "jcl-over-slf4j"
 	}
-	optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
+	optional("org.codehaus.groovy:groovy-templates:${groovyVersion}")
 	optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
 	optional("org.reactivestreams:reactive-streams")