Skip to content

Commit 5ee0580

Browse files
committed
Upgrade to the latest Framework 6.0.x release
Closes gh-40929
1 parent 4bb9197 commit 5ee0580

File tree

5 files changed

+5
-4
lines changed

5 files changed

+5
-4
lines changed

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ kotlinVersion=1.9.24
1414
mavenVersion=3.9.4
1515
nativeBuildToolsVersion=0.9.28
1616
springFrameworkVersion=6.1.8
17+
springFramework60xVersion=6.0.21
1718
tomcatVersion=10.1.24
1819

1920
kotlin.stdlib.default.dependency=false

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ configurations.all {
1717
// Downgrade Spring Framework as Gradle cannot cope with 6.1.0-M1's
1818
// multi-version jar files with bytecode in META-INF/versions/21
1919
if (dependency.requested.group.equals("org.springframework")) {
20-
dependency.useVersion("6.0.10")
20+
dependency.useVersion("$springFramework60xVersion")
2121
}
2222
// We manage the version of commons-compress here rather than
2323
// in spring-boot-parent to minimize conflicts with Testcontainers

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ configurations {
5353
// Downgrade Spring Framework as Gradle cannot cope with 6.1.0-M1's
5454
// multi-version jar files with bytecode in META-INF/versions/21
5555
if (dependency.requested.group.equals("org.springframework")) {
56-
dependency.useVersion("6.0.10")
56+
dependency.useVersion("$springFramework60xVersion")
5757
}
5858
// We manage the version of commons-compress here rather than
5959
// in spring-boot-parent to minimize conflicts with Testcontainers

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ configurations {
2727
// Downgrade Spring Framework as Gradle cannot cope with 6.1.0-M1's
2828
// multi-version jar files with bytecode in META-INF/versions/21
2929
if (dependency.requested.group.equals("org.springframework")) {
30-
dependency.useVersion("6.0.10")
30+
dependency.useVersion("$springFramework60xVersion")
3131
}
3232
// We manage the version of commons-compress here rather than
3333
// in spring-boot-parent to minimize conflicts with Testcontainers

spring-boot-system-tests/spring-boot-image-tests/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ configurations {
2222
// Downgrade Spring Framework as Gradle cannot cope with 6.1.0-M1's
2323
// multi-version jar files with bytecode in META-INF/versions/21
2424
if (dependency.requested.group.equals("org.springframework")) {
25-
dependency.useVersion("6.0.10")
25+
dependency.useVersion("$springFramework60xVersion")
2626
}
2727
}
2828
}

0 commit comments

Comments
 (0)