Merge branch '2.6.x' into 2.7.x

Closes gh-32284
2022-09-09 16:46:43 +01:00
parent 144fdaa703 23c2f73b3f
commit f17df7bf30
10 changed files with 182 additions and 53 deletions
--- 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
@@ -120,3 +120,7 @@ task zip(type: Zip) {
 artifacts {
 	"documentation" zip
 }
+
+toolchain {
+	maximumCompatibleJavaVersion = JavaLanguageVersion.of(18)
+}