Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Groovy 4.0.1

Browse Source 
Closes gh-30279
This commit is contained in:
Andy Wilkinson
2022-03-18 12:34:13 +00:00
parent 568cd687af
commit dd812a3f76
10 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-cli/build.gradle
View File

@@ -16,7 +16,7 @@ configurations {
dependencies {
compileOnly(project(":spring-boot-project:spring-boot"))
compileOnly("jakarta.servlet:jakarta.servlet-api")
compileOnly("org.codehaus.groovy:groovy-templates")
compileOnly("org.apache.groovy:groovy-templates")
compileOnly("org.springframework:spring-web")
dependenciesBom(project(path: ":spring-boot-project:spring-boot-dependencies", configuration: "effectiveBom"))
@@ -41,7 +41,7 @@ dependencies {
implementation("org.apache.maven:maven-settings-builder") {
exclude group: "javax.inject", module: "javax.inject"
}
implementation("org.codehaus.groovy:groovy")
implementation("org.apache.groovy:groovy")
implementation("org.slf4j:slf4j-simple")
implementation("org.sonatype.plexus:plexus-sec-dispatcher")
implementation("org.sonatype.sisu:sisu-inject-plexus") {
@@ -64,7 +64,7 @@ dependencies {
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
testImplementation(project(":spring-boot-project:spring-boot-test"))
testImplementation("org.assertj:assertj-core")
testImplementation("org.codehaus.groovy:groovy-templates")
testImplementation("org.apache.groovy:groovy-templates")
testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.mockito:mockito-core")
testImplementation("org.mockito:mockito-junit-jupiter")

4
spring-boot-project/spring-boot-cli/src/main/content/legal/open_source_licenses.txt
View File

@@ -43,7 +43,7 @@ SECTION 2: Apache License, V2.0
>>> Plexus Cipher: encryption/decryption Component (org.sonatype.plexus:plexus-cipher)
>>> Plexus Security Dispatcher Component (org.sonatype.plexus:plexus-sec-dispatcher)
>>> Apache Commons Logging (commons-logging:commons-logging)
>>> Apache Groovy (org.codehaus.groovy:groovy)
>>> Apache Groovy (org.apache.groovy:groovy)
>>> Maven Aether Provider (org.apache.maven:maven-aether-provider)
>>> Maven Model (org.apache.maven:maven-model)
>>> Maven Model Builder (org.apache.maven:maven-model-builder)
@@ -178,7 +178,7 @@ Apache License, V2.0 is applicable to the following component(s).
>>> org.sonatype.plexus:plexus-cipher
>>> org.sonatype.plexus:plexus-sec-dispatcher
>>> commons-logging:commons-logging
>>> org.codehaus.groovy:groovy
>>> org.apache.groovy:groovy
>>> org.apache.maven:maven-aether-provider
>>> org.apache.maven:maven-model
>>> org.apache.maven:maven-model-builder

3
spring-boot-project/spring-boot-cli/src/test/resources/repro-samples/grab-ant-builder.groovy
View File

@@ -1,4 +1,5 @@
@Grab("org.codehaus.groovy:groovy-ant:2.1.6")
@Grab("org.apache.groovy:groovy-ant:4.0.1")
import groovy.ant.AntBuilder
@RestController
class MainController {