Remove compatibility blocks from Gradle plugin integration tests

Closes spring-projectsgh-37453

Author: scottfrederick

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBinding.gradle

@@ -5,17 +5,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) < 0) {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-else {
-	java {
-		sourceCompatibility = '1.8'
-		targetCompatibility = '1.8'
-	}
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	bindings = [ "${projectDir}/bindings/ca-certificates:/platform/bindings/certificates" as String ]

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromBuilder.gradle

@@ -5,17 +5,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) < 0) {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-else {
-	java {
-		sourceCompatibility = '1.8'
-		targetCompatibility = '1.8'
-	}
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	buildpacks = [ "spring-boot/test-info" ]

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromDirectory.gradle

@@ -5,17 +5,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) < 0) {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-else {
-	java {
-		sourceCompatibility = '1.8'
-		targetCompatibility = '1.8'
-	}
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	buildpacks = [ "file://${projectDir}/buildpack/hello-world" as String ]

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromTarGzip.gradle

@@ -5,17 +5,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) < 0) {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-else {
-	java {
-		sourceCompatibility = '1.8'
-		targetCompatibility = '1.8'
-	}
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	buildpacks = [ "file://${projectDir}/hello-world.tgz" as String ]

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpacksFromImages.gradle

@@ -5,17 +5,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) < 0) {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-else {
-	java {
-		sourceCompatibility = '1.8'
-		targetCompatibility = '1.8'
-	}
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	buildpacks = ["projects.registry.vmware.com/springboot/test-info:latest"]

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCommandLineOptions.gradle

@@ -4,14 +4,3 @@ plugins {
 	id 'java'
 	id 'org.springframework.boot' version '{version}'
 }
-
-if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) < 0) {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-else {
-	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

@@ -5,17 +5,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) < 0) {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-else {
-	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"

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomName.gradle

@@ -5,17 +5,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) < 0) {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-else {
-	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"

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithLaunchScript.gradle

@@ -5,17 +5,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) < 0) {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-else {
-	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

@@ -9,17 +9,6 @@ if (project.hasProperty('applyWarPlugin')) {
 	apply plugin: 'war'
 }
 
-if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) < 0) {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-else {
-	java {
-		sourceCompatibility = '1.8'
-		targetCompatibility = '1.8'
-	}
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	network = "none"

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithTag.gradle

@@ -5,17 +5,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) < 0) {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-else {
-	java {
-		sourceCompatibility = '1.8'
-		targetCompatibility = '1.8'
-	}
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	tags = [ "example.com/myapp:latest" ]

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithVolumeCaches.gradle

@@ -5,17 +5,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) < 0) {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-else {
-	java {
-		sourceCompatibility = '1.8'
-		targetCompatibility = '1.8'
-	}
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	buildCache {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithWarPackagingAndJarConfiguration.gradle

@@ -5,17 +5,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) < 0) {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-else {
-	java {
-		sourceCompatibility = '1.8'
-		targetCompatibility = '1.8'
-	}
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	archiveFile = bootWar.archiveFile

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWhenCachesAreConfiguredTwice.gradle

@@ -5,17 +5,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) < 0) {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-else {
-	java {
-		sourceCompatibility = '1.8'
-		targetCompatibility = '1.8'
-	}
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	buildCache {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuilderError.gradle

@@ -5,17 +5,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) < 0) {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-else {
-	java {
-		sourceCompatibility = '1.8'
-		targetCompatibility = '1.8'
-	}
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	environment = ["FORCE_FAILURE": "true"]

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuildpackNotInBuilder.gradle

@@ -5,17 +5,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) < 0) {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-else {
-	java {
-		sourceCompatibility = '1.8'
-		targetCompatibility = '1.8'
-	}
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	buildpacks = [ "urn:cnb:builder:example/does-not-exist:0.0.1" ]

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidTag.gradle

@@ -5,17 +5,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) < 0) {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-else {
-	java {
-		sourceCompatibility = '1.8'
-		targetCompatibility = '1.8'
-	}
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	tags = [ "example/Invalid-Tag-Name" ]

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.gradle

@@ -9,17 +9,6 @@ if (project.hasProperty('applyWarPlugin')) {
 	apply plugin: 'war'
 }
 
-if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) < 0) {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-else {
-	java {
-		sourceCompatibility = '1.8'
-		targetCompatibility = '1.8'
-	}
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 }

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.gradle

@@ -5,17 +5,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) < 0) {
-	sourceCompatibility = '1.8'
-	targetCompatibility = '1.8'
-}
-else {
-	java {
-		sourceCompatibility = '1.8'
-		targetCompatibility = '1.8'
-	}
-}
-
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	publish = true