Upgrade to Spring Framework 6.1.0-M1

Closes gh-35977 Closes gh-35980
2023-06-19 09:57:27 +01:00
parent 4dc0b26eea
commit ca5bd37e81
20 changed files with 78 additions and 129 deletions
--- 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
@@ -17,6 +17,17 @@ configurations {
 		extendsFrom dependencyManagement
 		transitive = false
 	}
+	all {
+		resolutionStrategy {
+			eachDependency { dependency ->
+				// 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")
+				}
+			}
+		}
+	}
 }

 dependencies {