Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
buildSrc/src/main/java/org/springframework/boot/build/classpath/CheckClasspathForProhibitedDependencies.java
View File

@ -76,6 +76,9 @@ public class CheckClasspathForProhibitedDependencies extends DefaultTask {
if (group.equals("javax.money")) {
return false;
}
if (group.equals("org.codehaus.groovy")) {
return true;
}
if (group.startsWith("javax")) {
return true;
}

2
spring-boot-project/spring-boot-autoconfigure/build.gradle
View File

@ -67,7 +67,7 @@ dependencies {
optional("org.apache.tomcat.embed:tomcat-embed-websocket")
optional("org.apache.tomcat:tomcat-jdbc")
optional("org.apiguardian:apiguardian-api")
optional("org.codehaus.groovy:groovy-templates")
optional("org.apache.groovy:groovy-templates")
optional("com.github.ben-manes.caffeine:caffeine")
optional("com.github.mxab.thymeleaf.extras:thymeleaf-extras-data-attribute")
optional("com.sendgrid:sendgrid-java") {

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 {

4
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -284,8 +284,8 @@ bom {
]
}
}
library("Groovy", "3.0.9") {
group("org.codehaus.groovy") {
library("Groovy", "4.0.1") {
group("org.apache.groovy") {
imports = [
"groovy-bom"
]

2
spring-boot-project/spring-boot-docs/build.gradle
View File

@ -102,7 +102,7 @@ dependencies {
}
implementation("org.apache.tomcat.embed:tomcat-embed-core")
implementation("org.assertj:assertj-core")
implementation("org.codehaus.groovy:groovy")
implementation("org.apache.groovy:groovy")
implementation("org.hibernate:hibernate-jcache") {
exclude group: "javax.activation", module: "javax.activation-api"
exclude group: "javax.persistence", module: "javax.persistence-api"

2
spring-boot-project/spring-boot-starters/spring-boot-starter-groovy-templates/build.gradle
View File

@ -6,5 +6,5 @@ description = "Starter for building MVC web applications using Groovy Templates
dependencies {
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
api("org.codehaus.groovy:groovy-templates")
api("org.apache.groovy:groovy-templates")
}

4
spring-boot-project/spring-boot-test/build.gradle
View File

@ -46,8 +46,8 @@ dependencies {
testImplementation("ch.qos.logback:logback-classic")
testImplementation("com.squareup.okhttp3:okhttp")
testImplementation("org.apache.tomcat.embed:tomcat-embed-core")
testImplementation("org.codehaus.groovy:groovy")
testImplementation("org.codehaus.groovy:groovy-xml")
testImplementation("org.apache.groovy:groovy")
testImplementation("org.apache.groovy:groovy-xml")
testImplementation("org.eclipse:yasson")
testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.mockito:mockito-junit-jupiter")

4
spring-boot-project/spring-boot/build.gradle
View File

@ -56,8 +56,8 @@ dependencies {
optional("org.apache.tomcat.embed:tomcat-embed-jasper")
optional("org.apache.tomcat:tomcat-jdbc")
optional("org.assertj:assertj-core")
optional("org.codehaus.groovy:groovy")
optional("org.codehaus.groovy:groovy-xml")
optional("org.apache.groovy:groovy")
optional("org.apache.groovy:groovy-xml")
optional("org.eclipse.jetty:jetty-servlets")
optional("org.eclipse.jetty:jetty-util")
optional("org.eclipse.jetty:jetty-webapp") {