Skip to content

Commit f65408f

Browse files
committed
Avoid references to groovy-all artifact across all modules
Issue: SPR-17446
1 parent 59fa647 commit f65408f

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

spring-context/spring-context.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ dependencies {
2323
optional("org.hibernate:hibernate-validator:5.4.2.Final")
2424
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
2525
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
26-
testCompile("org.codehaus.groovy:groovy-xml:${groovyVersion}")
2726
testCompile("org.codehaus.groovy:groovy-jsr223:${groovyVersion}")
2827
testCompile("org.codehaus.groovy:groovy-test:${groovyVersion}")
28+
testCompile("org.codehaus.groovy:groovy-xml:${groovyVersion}")
2929
testCompile("org.apache.commons:commons-pool2:2.6.0")
3030
testCompile("javax.inject:javax.inject-tck:1")
3131
testCompile("org.awaitility:awaitility:3.1.2")

spring-test/spring-test.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies {
3232
optional("org.junit.jupiter:junit-jupiter-api")
3333
optional("org.testng:testng:6.14.3")
3434
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
35-
optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
35+
optional("org.codehaus.groovy:groovy:${groovyVersion}")
3636
optional("org.hamcrest:hamcrest-core:1.3")
3737
optional("org.apache.taglibs:taglibs-standard-jstlel:1.2.5") {
3838
exclude group: "org.apache.taglibs", module: "taglibs-standard-spec"

spring-tx/spring-tx.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ dependencies {
1111
optional("javax.transaction:javax.transaction-api:1.3")
1212
optional("com.ibm.websphere:uow:6.0.2.17")
1313
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
14-
testCompile("org.codehaus.groovy:groovy-all:${groovyVersion}")
14+
testCompile("org.codehaus.groovy:groovy:${groovyVersion}")
1515
testCompile("org.eclipse.persistence:javax.persistence:2.2.0")
1616
}

spring-web/spring-web.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ dependencies {
6060
optional("com.googlecode.protobuf-java-format:protobuf-java-format:1.4")
6161
optional("com.rometools:rome:1.11.1")
6262
optional("com.caucho:hessian:4.0.51")
63-
optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
63+
optional("org.codehaus.groovy:groovy:${groovyVersion}")
6464
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
6565
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
6666
testCompile("io.projectreactor:reactor-test")

spring-webmvc/spring-webmvc.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ dependencies {
3939
exclude group: "org.springframework", module: "spring-web"
4040
exclude group: "org.slf4j", module: "jcl-over-slf4j"
4141
}
42-
optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
42+
optional("org.codehaus.groovy:groovy-templates:${groovyVersion}")
4343
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
4444
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
4545
optional("org.reactivestreams:reactive-streams")

0 commit comments

Comments
 (0)