From 98bfaf0412c6d62c5ecace2e99d89276ce2933f8 Mon Sep 17 00:00:00 2001 From: Scott Frederick Date: Fri, 22 Sep 2023 10:53:54 -0500 Subject: [PATCH] Remove compatibility blocks from Gradle plugin integration tests Closes gh-37453 --- ...mageIntegrationTests-buildsImageWithBinding.gradle | 11 ----------- ...onTests-buildsImageWithBuildpackFromBuilder.gradle | 11 ----------- ...Tests-buildsImageWithBuildpackFromDirectory.gradle | 11 ----------- ...onTests-buildsImageWithBuildpackFromTarGzip.gradle | 11 ----------- ...onTests-buildsImageWithBuildpacksFromImages.gradle | 11 ----------- ...tionTests-buildsImageWithCommandLineOptions.gradle | 11 ----------- ...sts-buildsImageWithCustomBuilderAndRunImage.gradle | 11 ----------- ...eIntegrationTests-buildsImageWithCustomName.gradle | 11 ----------- ...ntegrationTests-buildsImageWithLaunchScript.gradle | 11 ----------- ...grationTests-buildsImageWithNetworkModeNone.gradle | 11 ----------- ...ildImageIntegrationTests-buildsImageWithTag.gradle | 11 ----------- ...ntegrationTests-buildsImageWithVolumeCaches.gradle | 11 ----------- ...ldsImageWithWarPackagingAndJarConfiguration.gradle | 11 ----------- ...tionTests-failsWhenCachesAreConfiguredTwice.gradle | 11 ----------- ...ImageIntegrationTests-failsWithBuilderError.gradle | 11 ----------- ...grationTests-failsWithBuildpackNotInBuilder.gradle | 11 ----------- ...ldImageIntegrationTests-failsWithInvalidTag.gradle | 11 ----------- .../bundling/BootBuildImageIntegrationTests.gradle | 11 ----------- .../BootBuildImageRegistryIntegrationTests.gradle | 11 ----------- 19 files changed, 209 deletions(-) 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 index 396f39db9d0..f68dbdacee3 100644 --- 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 @@ -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 ] 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 index 914b298b0c6..f1304277bf5 100644 --- 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 @@ -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" ] 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 index dbfc69cce5f..a883fd744ff 100644 --- 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 @@ -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 ] 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 index 4855a105813..801992e5f4c 100644 --- 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 @@ -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 ] 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 index 4e1a7dafd37..35199cfca5b 100644 --- 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 @@ -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"] 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 index 612f78e9f0e..7851dc8761c 100644 --- 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 @@ -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' - } -} 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 index 26884ddc121..4d8e204b0ea 100644 --- 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 @@ -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" 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 index a15452e3793..07391949231 100644 --- 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 @@ -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" 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 index 375eaa63354..0abc60e708f 100644 --- 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 @@ -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() } 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 index 5e4309cc355..598d223e1b2 100644 --- 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 @@ -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" 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 index 2b1d065355f..cedb7782784 100644 --- 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 @@ -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" ] 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 index 5fe8736f593..b2de73c83e7 100644 --- 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 @@ -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 { 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 index 6a2437cd3b6..633fabaf471 100644 --- 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 @@ -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 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 index 9352033a285..e6deefda463 100644 --- 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 @@ -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 { 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 index 153c3f0633f..87fd0924a6a 100644 --- 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 @@ -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"] 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 index 7a3eef1363c..8e039832505 100644 --- 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 @@ -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" ] 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 index c1a13e432a8..03b2e3eb46c 100644 --- 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 @@ -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" ] 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 index cdff07f202e..88675216d30 100644 --- 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 @@ -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" } 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 index 5cd65bf19d9..3cbaadd8175 100644 --- 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 @@ -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