Merge branch '3.1.x'

Closes gh-37551

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBindCaches.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.2"
 	pullPolicy = "IF_NOT_PRESENT"

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.2"
 	pullPolicy = "IF_NOT_PRESENT"

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.2"
 	pullPolicy = "IF_NOT_PRESENT"

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.2"
 	pullPolicy = "IF_NOT_PRESENT"

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.2"
 	pullPolicy = "IF_NOT_PRESENT"

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.2"
 	pullPolicy = "IF_NOT_PRESENT"

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'
-}

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.2"

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.2"

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithEmptySecurityOptions.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.2"
 	pullPolicy = "IF_NOT_PRESENT"

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()
 }

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.2"
 	pullPolicy = "IF_NOT_PRESENT"

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.2"
 	pullPolicy = PullPolicy.ALWAYS

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.2"
 	pullPolicy = "IF_NOT_PRESENT"

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.2"
 	pullPolicy = "IF_NOT_PRESENT"

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.2"
 	pullPolicy = "IF_NOT_PRESENT"

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.2"
 	buildCache {

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.2"
 	pullPolicy = "IF_NOT_PRESENT"

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.2"
 	pullPolicy = "IF_NOT_PRESENT"

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.2"
 	pullPolicy = "IF_NOT_PRESENT"

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.2"
 	pullPolicy = "IF_NOT_PRESENT"

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.2"
 	publish = true