mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-15 01:07:30 +08:00
Remove compatibility blocks from Gradle plugin integration tests
Closes gh-37453
This commit is contained in:
parent
6936d7e5f5
commit
98bfaf0412
@ -5,17 +5,6 @@ plugins {
|
|||||||
id 'org.springframework.boot' version '{version}'
|
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 {
|
bootBuildImage {
|
||||||
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
||||||
bindings = [ "${projectDir}/bindings/ca-certificates:/platform/bindings/certificates" as String ]
|
bindings = [ "${projectDir}/bindings/ca-certificates:/platform/bindings/certificates" as String ]
|
||||||
|
@ -5,17 +5,6 @@ plugins {
|
|||||||
id 'org.springframework.boot' version '{version}'
|
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 {
|
bootBuildImage {
|
||||||
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
||||||
buildpacks = [ "spring-boot/test-info" ]
|
buildpacks = [ "spring-boot/test-info" ]
|
||||||
|
@ -5,17 +5,6 @@ plugins {
|
|||||||
id 'org.springframework.boot' version '{version}'
|
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 {
|
bootBuildImage {
|
||||||
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
||||||
buildpacks = [ "file://${projectDir}/buildpack/hello-world" as String ]
|
buildpacks = [ "file://${projectDir}/buildpack/hello-world" as String ]
|
||||||
|
@ -5,17 +5,6 @@ plugins {
|
|||||||
id 'org.springframework.boot' version '{version}'
|
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 {
|
bootBuildImage {
|
||||||
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
||||||
buildpacks = [ "file://${projectDir}/hello-world.tgz" as String ]
|
buildpacks = [ "file://${projectDir}/hello-world.tgz" as String ]
|
||||||
|
@ -5,17 +5,6 @@ plugins {
|
|||||||
id 'org.springframework.boot' version '{version}'
|
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 {
|
bootBuildImage {
|
||||||
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
||||||
buildpacks = ["projects.registry.vmware.com/springboot/test-info:latest"]
|
buildpacks = ["projects.registry.vmware.com/springboot/test-info:latest"]
|
||||||
|
@ -4,14 +4,3 @@ plugins {
|
|||||||
id 'java'
|
id 'java'
|
||||||
id 'org.springframework.boot' version '{version}'
|
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'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -5,17 +5,6 @@ plugins {
|
|||||||
id 'org.springframework.boot' version '{version}'
|
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 {
|
bootBuildImage {
|
||||||
imageName = "example/test-image-custom"
|
imageName = "example/test-image-custom"
|
||||||
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
||||||
|
@ -5,17 +5,6 @@ plugins {
|
|||||||
id 'org.springframework.boot' version '{version}'
|
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 {
|
bootBuildImage {
|
||||||
imageName = "example/test-image-name"
|
imageName = "example/test-image-name"
|
||||||
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
||||||
|
@ -5,17 +5,6 @@ plugins {
|
|||||||
id 'org.springframework.boot' version '{version}'
|
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 {
|
bootJar {
|
||||||
launchScript()
|
launchScript()
|
||||||
}
|
}
|
||||||
|
@ -9,17 +9,6 @@ if (project.hasProperty('applyWarPlugin')) {
|
|||||||
apply plugin: 'war'
|
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 {
|
bootBuildImage {
|
||||||
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
||||||
network = "none"
|
network = "none"
|
||||||
|
@ -5,17 +5,6 @@ plugins {
|
|||||||
id 'org.springframework.boot' version '{version}'
|
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 {
|
bootBuildImage {
|
||||||
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
||||||
tags = [ "example.com/myapp:latest" ]
|
tags = [ "example.com/myapp:latest" ]
|
||||||
|
@ -5,17 +5,6 @@ plugins {
|
|||||||
id 'org.springframework.boot' version '{version}'
|
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 {
|
bootBuildImage {
|
||||||
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
||||||
buildCache {
|
buildCache {
|
||||||
|
@ -5,17 +5,6 @@ plugins {
|
|||||||
id 'org.springframework.boot' version '{version}'
|
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 {
|
bootBuildImage {
|
||||||
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
||||||
archiveFile = bootWar.archiveFile
|
archiveFile = bootWar.archiveFile
|
||||||
|
@ -5,17 +5,6 @@ plugins {
|
|||||||
id 'org.springframework.boot' version '{version}'
|
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 {
|
bootBuildImage {
|
||||||
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
||||||
buildCache {
|
buildCache {
|
||||||
|
@ -5,17 +5,6 @@ plugins {
|
|||||||
id 'org.springframework.boot' version '{version}'
|
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 {
|
bootBuildImage {
|
||||||
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
||||||
environment = ["FORCE_FAILURE": "true"]
|
environment = ["FORCE_FAILURE": "true"]
|
||||||
|
@ -5,17 +5,6 @@ plugins {
|
|||||||
id 'org.springframework.boot' version '{version}'
|
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 {
|
bootBuildImage {
|
||||||
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
||||||
buildpacks = [ "urn:cnb:builder:example/does-not-exist:0.0.1" ]
|
buildpacks = [ "urn:cnb:builder:example/does-not-exist:0.0.1" ]
|
||||||
|
@ -5,17 +5,6 @@ plugins {
|
|||||||
id 'org.springframework.boot' version '{version}'
|
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 {
|
bootBuildImage {
|
||||||
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
||||||
tags = [ "example/Invalid-Tag-Name" ]
|
tags = [ "example/Invalid-Tag-Name" ]
|
||||||
|
@ -9,17 +9,6 @@ if (project.hasProperty('applyWarPlugin')) {
|
|||||||
apply plugin: 'war'
|
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 {
|
bootBuildImage {
|
||||||
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
||||||
}
|
}
|
||||||
|
@ -5,17 +5,6 @@ plugins {
|
|||||||
id 'org.springframework.boot' version '{version}'
|
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 {
|
bootBuildImage {
|
||||||
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
||||||
publish = true
|
publish = true
|
||||||
|
Loading…
Reference in New Issue
Block a user