Merge branch '2.5.x' into 2.6.x

Closes gh-29954
2022-02-22 20:08:31 +00:00
parent 47d1f08e4d 1e8d29f7aa
commit 3614c8d1f8
3 changed files with 3 additions and 25 deletions
--- a/spring-boot-project/spring-boot/build.gradle
+++ b/spring-boot-project/spring-boot/build.gradle
@@ -161,18 +161,6 @@ sourceSets {
 	}
 }

-compileKotlin {
-	kotlinOptions {
-		jvmTarget = 1.8
-	}
-}
-
-compileTestKotlin {
-	kotlinOptions {
-		jvmTarget = 1.8
-	}
-}
-
 toolchain {
 	testJvmArgs.add("--add-opens=java.base/java.net=ALL-UNNAMED")
 }