root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Upgrade to Groovy 4.0 

Closes gh-27985
This commit is contained in:
Juergen Hoeller 2022-02-04 21:01:02 +01:00
parent 4358b48b08
commit 9688e61e20
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -56,7 +56,7 @@ configure(allprojects) { project ->
entry 'aspectjtools'
entry 'aspectjweaver'
}
dependencySet(group: 'org.codehaus.groovy', version: '3.0.9') {
dependencySet(group: 'org.apache.groovy', version: '4.0.0') {
entry 'groovy'
entry 'groovy-jsr223'
entry 'groovy-templates' // requires findbugs for warning-free compilation

2
spring-beans/spring-beans.gradle
View File

@ -6,7 +6,7 @@ dependencies {
api(project(":spring-core"))
optional("jakarta.inject:jakarta.inject-api")
optional("org.yaml:snakeyaml")
optional("org.codehaus.groovy:groovy-xml")
optional("org.apache.groovy:groovy-xml")
optional("org.jetbrains.kotlin:kotlin-reflect")
optional("org.jetbrains.kotlin:kotlin-stdlib")
testImplementation(testFixtures(project(":spring-core")))

6
spring-context/spring-context.gradle
View File

@ -16,7 +16,7 @@ dependencies {
optional("jakarta.validation:jakarta.validation-api")
optional("javax.money:money-api")
optional("org.aspectj:aspectjweaver")
optional("org.codehaus.groovy:groovy")
optional("org.apache.groovy:groovy")
optional("org.apache-extras.beanshell:bsh")
optional("org.hibernate:hibernate-validator")
optional("org.jetbrains.kotlin:kotlin-reflect")
@ -26,8 +26,8 @@ dependencies {
testImplementation(testFixtures(project(":spring-beans")))
testImplementation(testFixtures(project(":spring-core")))
testImplementation("io.projectreactor:reactor-core")
testImplementation("org.codehaus.groovy:groovy-jsr223")
testImplementation("org.codehaus.groovy:groovy-xml")
testImplementation("org.apache.groovy:groovy-jsr223")
testImplementation("org.apache.groovy:groovy-xml")
testImplementation("org.apache.commons:commons-pool2")
testImplementation("org.awaitility:awaitility")
testImplementation("jakarta.inject:jakarta.inject-tck")

2
spring-test/spring-test.gradle
View File

@ -27,7 +27,7 @@ dependencies {
optional("org.junit.jupiter:junit-jupiter-api")
optional("org.testng:testng")
optional("org.aspectj:aspectjweaver")
optional("org.codehaus.groovy:groovy")
optional("org.apache.groovy:groovy")
optional("org.hamcrest:hamcrest")
optional("net.sourceforge.htmlunit:htmlunit")
optional("org.seleniumhq.selenium:htmlunit-driver") {

2
spring-tx/spring-tx.gradle
View File

@ -21,7 +21,7 @@ dependencies {
testImplementation(testFixtures(project(":spring-context")))
testImplementation(testFixtures(project(":spring-core")))
testImplementation("org.aspectj:aspectjweaver")
testImplementation("org.codehaus.groovy:groovy")
testImplementation("org.apache.groovy:groovy")
testImplementation("jakarta.persistence:jakarta.persistence-api")
testImplementation("io.projectreactor:reactor-test")
}

2
spring-web/spring-web.gradle
View File

@ -47,7 +47,7 @@ dependencies {
optional("com.google.protobuf:protobuf-java-util")
optional("com.googlecode.protobuf-java-format:protobuf-java-format")
optional("com.rometools:rome")
optional("org.codehaus.groovy:groovy")
optional("org.apache.groovy:groovy")
optional("org.jetbrains.kotlin:kotlin-reflect")
optional("org.jetbrains.kotlin:kotlin-stdlib")
optional("org.jetbrains.kotlinx:kotlinx-serialization-json")

2
spring-webmvc/spring-webmvc.gradle
View File

@ -26,7 +26,7 @@ dependencies {
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml")
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile")
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor")
optional("org.codehaus.groovy:groovy-templates")
optional("org.apache.groovy:groovy-templates")
optional("org.jetbrains.kotlin:kotlin-reflect")
optional("org.jetbrains.kotlin:kotlin-stdlib")
optional("org.reactivestreams:reactive-streams")