Merge branch '2.7.x' into 3.0.x

scottfrederick · scottfrederick · commit 7322c078c41a · 2023-09-22T11:32:07.000-05:00
Closes spring-projectsgh-37549
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBinding.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBinding.gradle
@@ -3,11 +3,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-java {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromBuilder.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromBuilder.gradle
@@ -3,11 +3,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-java {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromDirectory.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromDirectory.gradle
@@ -3,11 +3,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-java {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromTarGzip.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromTarGzip.gradle
@@ -3,11 +3,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-java {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpacksFromImages.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpacksFromImages.gradle
@@ -3,11 +3,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-java {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCommandLineOptions.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCommandLineOptions.gradle
@@ -2,8 +2,3 @@ plugins {
 	id 'java'
 	id 'org.springframework.boot' version '{version}'
 }
-
-java {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomBuilderAndRunImage.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomBuilderAndRunImage.gradle
@@ -3,11 +3,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-java {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-
 bootBuildImage {
 	imageName = "example/test-image-custom"
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomName.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomName.gradle
@@ -3,11 +3,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-java {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-
 bootBuildImage {
 	imageName = "example/test-image-name"
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithLaunchScript.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithLaunchScript.gradle
@@ -3,11 +3,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-java {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-
 bootJar {
 	launchScript()
 }
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithNetworkModeNone.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithNetworkModeNone.gradle
@@ -7,11 +7,6 @@ if (project.hasProperty('applyWarPlugin')) {
 	apply plugin: 'war'
 }
 
-java {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithPullPolicy.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithPullPolicy.gradle
@@ -9,11 +9,6 @@ if (project.hasProperty('applyWarPlugin')) {
 	apply plugin: 'war'
 }
 
-java {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	pullPolicy = PullPolicy.ALWAYS
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithTag.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithTag.gradle
@@ -3,11 +3,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-java {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithVolumeCaches.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithVolumeCaches.gradle
@@ -3,11 +3,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-java {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithWarPackagingAndJarConfiguration.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithWarPackagingAndJarConfiguration.gradle
@@ -3,11 +3,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-java {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWhenCachesAreConfiguredTwice.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWhenCachesAreConfiguredTwice.gradle
@@ -3,11 +3,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-java {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	buildCache {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuilderError.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuilderError.gradle
@@ -3,11 +3,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-java {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuildpackNotInBuilder.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuildpackNotInBuilder.gradle
@@ -3,11 +3,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-java {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidTag.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidTag.gradle
@@ -3,11 +3,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-java {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.gradle
@@ -7,11 +7,6 @@ if (project.hasProperty('applyWarPlugin')) {
 	apply plugin: 'war'
 }
 
-java {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.gradle
@@ -3,11 +3,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-java {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	publish = true

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,3 @@ plugins {`
`2`	`2`	`id 'java'`
`3`	`3`	`id 'org.springframework.boot' version '{version}'`
`4`	`4`	`}`
`5`		`-`
`6`		`-java {`
`7`		`- sourceCompatibility = '1.8'`
`8`		`- targetCompatibility = '1.8'`
`9`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,6 @@ plugins {`
`3`	`3`	`id 'org.springframework.boot' version '{version}'`
`4`	`4`	`}`
`5`	`5`
`6`		`-java {`
`7`		`- sourceCompatibility = '1.8'`
`8`		`- targetCompatibility = '1.8'`
`9`		`-}`
`10`		`-`
`11`	`6`	`bootJar {`
`12`	`7`	`launchScript()`
`13`	`8`	`}`