Merge branch '2.6.x' into 2.7.x

Closes gh-29955
2022-02-22 20:11:47 +00:00
parent 288533ba4a 3614c8d1f8
commit 2d9177dd9d
3 changed files with 1 additions and 24 deletions
--- a/spring-boot-project/spring-boot/build.gradle
+++ b/spring-boot-project/spring-boot/build.gradle
@@ -180,18 +180,6 @@ sourceSets {
 	}
 }

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