From 5ee058033926417c4b6ac1c97a64d2da0634fb4a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 28 May 2024 16:52:00 +0100 Subject: [PATCH] Upgrade to the latest Framework 6.0.x release Closes gh-40929 --- gradle.properties | 1 + .../spring-boot-buildpack-platform/build.gradle | 2 +- .../spring-boot-tools/spring-boot-gradle-plugin/build.gradle | 2 +- .../spring-boot-tools/spring-boot-loader-tools/build.gradle | 2 +- spring-boot-system-tests/spring-boot-image-tests/build.gradle | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 56caefede54..8168f400a3b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,6 +14,7 @@ kotlinVersion=1.9.24 mavenVersion=3.9.4 nativeBuildToolsVersion=0.9.28 springFrameworkVersion=6.1.8 +springFramework60xVersion=6.0.21 tomcatVersion=10.1.24 kotlin.stdlib.default.dependency=false diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle index f3886f7b847..10e41123cbf 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle @@ -17,7 +17,7 @@ configurations.all { // Downgrade Spring Framework as Gradle cannot cope with 6.1.0-M1's // multi-version jar files with bytecode in META-INF/versions/21 if (dependency.requested.group.equals("org.springframework")) { - dependency.useVersion("6.0.10") + dependency.useVersion("$springFramework60xVersion") } // We manage the version of commons-compress here rather than // in spring-boot-parent to minimize conflicts with Testcontainers diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle index f1886f61f96..806778dd953 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle @@ -53,7 +53,7 @@ configurations { // Downgrade Spring Framework as Gradle cannot cope with 6.1.0-M1's // multi-version jar files with bytecode in META-INF/versions/21 if (dependency.requested.group.equals("org.springframework")) { - dependency.useVersion("6.0.10") + dependency.useVersion("$springFramework60xVersion") } // We manage the version of commons-compress here rather than // in spring-boot-parent to minimize conflicts with Testcontainers diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle index 7c205340653..1e1bf456000 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle @@ -27,7 +27,7 @@ configurations { // Downgrade Spring Framework as Gradle cannot cope with 6.1.0-M1's // multi-version jar files with bytecode in META-INF/versions/21 if (dependency.requested.group.equals("org.springframework")) { - dependency.useVersion("6.0.10") + dependency.useVersion("$springFramework60xVersion") } // We manage the version of commons-compress here rather than // in spring-boot-parent to minimize conflicts with Testcontainers diff --git a/spring-boot-system-tests/spring-boot-image-tests/build.gradle b/spring-boot-system-tests/spring-boot-image-tests/build.gradle index e4236f1b82f..40cd4ee6016 100644 --- a/spring-boot-system-tests/spring-boot-image-tests/build.gradle +++ b/spring-boot-system-tests/spring-boot-image-tests/build.gradle @@ -22,7 +22,7 @@ configurations { // Downgrade Spring Framework as Gradle cannot cope with 6.1.0-M1's // multi-version jar files with bytecode in META-INF/versions/21 if (dependency.requested.group.equals("org.springframework")) { - dependency.useVersion("6.0.10") + dependency.useVersion("$springFramework60xVersion") } } }