Merge branch '3.3.x' into 3.4.x

wilkinsona · wilkinsona · commit e6678b6d16eb · 2025-02-05T08:48:38.000Z
Closes gh-44130
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
@@ -84,12 +84,6 @@ sourceSets {
 	}
 }
 
-compileJava {
-	if ((!project.hasProperty("toolchainVersion")) && JavaVersion.current() == JavaVersion.VERSION_1_8) {
-		options.compilerArgs += ['-Xlint:-sunapi', '-XDenableSunApiLintControl']
-	}
-}
-
 plugins.withType(EclipsePlugin) {
 	eclipse {
 		classpath.file { merger ->

Original file line number	Diff line number	Diff line change
`@@ -84,12 +84,6 @@ sourceSets {`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
`87`		`-compileJava {`
`88`		`- if ((!project.hasProperty("toolchainVersion")) && JavaVersion.current() == JavaVersion.VERSION_1_8) {`
`89`		`- options.compilerArgs += ['-Xlint:-sunapi', '-XDenableSunApiLintControl']`
`90`		`- }`
`91`		`-}`
`92`		`-`
`93`	`87`	`plugins.withType(EclipsePlugin) {`
`94`	`88`	`eclipse {`
`95`	`89`	`classpath.file { merger ->`