mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-05 00:56:58 +08:00
Merge branch '3.2.x'
Closes gh-40931
This commit is contained in:
commit
cf447e3aa6
@ -15,6 +15,7 @@ kotlinVersion=1.9.24
|
|||||||
mavenVersion=3.9.4
|
mavenVersion=3.9.4
|
||||||
nativeBuildToolsVersion=0.10.2
|
nativeBuildToolsVersion=0.10.2
|
||||||
springFrameworkVersion=6.1.8
|
springFrameworkVersion=6.1.8
|
||||||
|
springFramework60xVersion=6.0.21
|
||||||
tomcatVersion=10.1.24
|
tomcatVersion=10.1.24
|
||||||
snakeYamlVersion=2.2
|
snakeYamlVersion=2.2
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ configurations.all {
|
|||||||
// Downgrade Spring Framework as Gradle cannot cope with 6.1.0-M1's
|
// Downgrade Spring Framework as Gradle cannot cope with 6.1.0-M1's
|
||||||
// multi-version jar files with bytecode in META-INF/versions/21
|
// multi-version jar files with bytecode in META-INF/versions/21
|
||||||
if (dependency.requested.group.equals("org.springframework")) {
|
if (dependency.requested.group.equals("org.springframework")) {
|
||||||
dependency.useVersion("6.0.10")
|
dependency.useVersion("$springFramework60xVersion")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -53,7 +53,7 @@ configurations {
|
|||||||
// Downgrade Spring Framework as Gradle cannot cope with 6.1.0-M1's
|
// Downgrade Spring Framework as Gradle cannot cope with 6.1.0-M1's
|
||||||
// multi-version jar files with bytecode in META-INF/versions/21
|
// multi-version jar files with bytecode in META-INF/versions/21
|
||||||
if (dependency.requested.group.equals("org.springframework")) {
|
if (dependency.requested.group.equals("org.springframework")) {
|
||||||
dependency.useVersion("6.0.10")
|
dependency.useVersion("$springFramework60xVersion")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -27,7 +27,7 @@ configurations {
|
|||||||
// Downgrade Spring Framework as Gradle cannot cope with 6.1.0-M1's
|
// Downgrade Spring Framework as Gradle cannot cope with 6.1.0-M1's
|
||||||
// multi-version jar files with bytecode in META-INF/versions/21
|
// multi-version jar files with bytecode in META-INF/versions/21
|
||||||
if (dependency.requested.group.equals("org.springframework")) {
|
if (dependency.requested.group.equals("org.springframework")) {
|
||||||
dependency.useVersion("6.0.10")
|
dependency.useVersion("$springFramework60xVersion")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -22,7 +22,7 @@ configurations {
|
|||||||
// Downgrade Spring Framework as Gradle cannot cope with 6.1.0-M1's
|
// Downgrade Spring Framework as Gradle cannot cope with 6.1.0-M1's
|
||||||
// multi-version jar files with bytecode in META-INF/versions/21
|
// multi-version jar files with bytecode in META-INF/versions/21
|
||||||
if (dependency.requested.group.equals("org.springframework")) {
|
if (dependency.requested.group.equals("org.springframework")) {
|
||||||
dependency.useVersion("6.0.10")
|
dependency.useVersion("$springFramework60xVersion")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user