Skip to content

Commit e80f743

Browse files
scottfrederickscottfrederick
committed
Merge branch '3.1.x'
Closes spring-projectsgh-37551
2 parents fb15125 + 3803bd9 commit e80f743

File tree

22 files changed

+0
-110
lines changed

22 files changed

+0
-110
lines changed

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

-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ plugins {
33
id 'org.springframework.boot' version '{version}'
44
}
55

6-
java {
7-
sourceCompatibility = '1.8'
8-
targetCompatibility = '1.8'
9-
}
10-
116
bootBuildImage {
127
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
138
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

-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ plugins {
33
id 'org.springframework.boot' version '{version}'
44
}
55

6-
java {
7-
sourceCompatibility = '1.8'
8-
targetCompatibility = '1.8'
9-
}
10-
116
bootBuildImage {
127
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
138
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

-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ plugins {
33
id 'org.springframework.boot' version '{version}'
44
}
55

6-
java {
7-
sourceCompatibility = '1.8'
8-
targetCompatibility = '1.8'
9-
}
10-
116
bootBuildImage {
127
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
138
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

-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ plugins {
33
id 'org.springframework.boot' version '{version}'
44
}
55

6-
java {
7-
sourceCompatibility = '1.8'
8-
targetCompatibility = '1.8'
9-
}
10-
116
bootBuildImage {
127
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
138
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

-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ plugins {
33
id 'org.springframework.boot' version '{version}'
44
}
55

6-
java {
7-
sourceCompatibility = '1.8'
8-
targetCompatibility = '1.8'
9-
}
10-
116
bootBuildImage {
127
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
138
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

-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ plugins {
33
id 'org.springframework.boot' version '{version}'
44
}
55

6-
java {
7-
sourceCompatibility = '1.8'
8-
targetCompatibility = '1.8'
9-
}
10-
116
bootBuildImage {
127
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
138
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

-5
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,3 @@ plugins {
22
id 'java'
33
id 'org.springframework.boot' version '{version}'
44
}
5-
6-
java {
7-
sourceCompatibility = '1.8'
8-
targetCompatibility = '1.8'
9-
}

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

-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ plugins {
33
id 'org.springframework.boot' version '{version}'
44
}
55

6-
java {
7-
sourceCompatibility = '1.8'
8-
targetCompatibility = '1.8'
9-
}
10-
116
bootBuildImage {
127
imageName = "example/test-image-custom"
138
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

-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ plugins {
33
id 'org.springframework.boot' version '{version}'
44
}
55

6-
java {
7-
sourceCompatibility = '1.8'
8-
targetCompatibility = '1.8'
9-
}
10-
116
bootBuildImage {
127
imageName = "example/test-image-name"
138
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

-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ plugins {
33
id 'org.springframework.boot' version '{version}'
44
}
55

6-
java {
7-
sourceCompatibility = '1.8'
8-
targetCompatibility = '1.8'
9-
}
10-
116
bootBuildImage {
127
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
138
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

-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ plugins {
33
id 'org.springframework.boot' version '{version}'
44
}
55

6-
java {
7-
sourceCompatibility = '1.8'
8-
targetCompatibility = '1.8'
9-
}
10-
116
bootJar {
127
launchScript()
138
}

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

-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ if (project.hasProperty('applyWarPlugin')) {
77
apply plugin: 'war'
88
}
99

10-
java {
11-
sourceCompatibility = '1.8'
12-
targetCompatibility = '1.8'
13-
}
14-
1510
bootBuildImage {
1611
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
1712
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

-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ if (project.hasProperty('applyWarPlugin')) {
99
apply plugin: 'war'
1010
}
1111

12-
java {
13-
sourceCompatibility = '1.8'
14-
targetCompatibility = '1.8'
15-
}
16-
1712
bootBuildImage {
1813
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
1914
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

-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ plugins {
33
id 'org.springframework.boot' version '{version}'
44
}
55

6-
java {
7-
sourceCompatibility = '1.8'
8-
targetCompatibility = '1.8'
9-
}
10-
116
bootBuildImage {
127
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
138
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

-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ plugins {
33
id 'org.springframework.boot' version '{version}'
44
}
55

6-
java {
7-
sourceCompatibility = '1.8'
8-
targetCompatibility = '1.8'
9-
}
10-
116
bootBuildImage {
127
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
138
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

-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ plugins {
33
id 'org.springframework.boot' version '{version}'
44
}
55

6-
java {
7-
sourceCompatibility = '1.8'
8-
targetCompatibility = '1.8'
9-
}
10-
116
bootBuildImage {
127
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
138
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

-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ plugins {
33
id 'org.springframework.boot' version '{version}'
44
}
55

6-
java {
7-
sourceCompatibility = '1.8'
8-
targetCompatibility = '1.8'
9-
}
10-
116
bootBuildImage {
127
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
138
buildCache {

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

-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ plugins {
33
id 'org.springframework.boot' version '{version}'
44
}
55

6-
java {
7-
sourceCompatibility = '1.8'
8-
targetCompatibility = '1.8'
9-
}
10-
116
bootBuildImage {
127
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
138
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

-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ plugins {
33
id 'org.springframework.boot' version '{version}'
44
}
55

6-
java {
7-
sourceCompatibility = '1.8'
8-
targetCompatibility = '1.8'
9-
}
10-
116
bootBuildImage {
127
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
138
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

-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ plugins {
33
id 'org.springframework.boot' version '{version}'
44
}
55

6-
java {
7-
sourceCompatibility = '1.8'
8-
targetCompatibility = '1.8'
9-
}
10-
116
bootBuildImage {
127
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
138
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

-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ if (project.hasProperty('applyWarPlugin')) {
77
apply plugin: 'war'
88
}
99

10-
java {
11-
sourceCompatibility = '1.8'
12-
targetCompatibility = '1.8'
13-
}
14-
1510
bootBuildImage {
1611
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
1712
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

-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ plugins {
33
id 'org.springframework.boot' version '{version}'
44
}
55

6-
java {
7-
sourceCompatibility = '1.8'
8-
targetCompatibility = '1.8'
9-
}
10-
116
bootBuildImage {
127
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
138
publish = true

0 commit comments

Comments
 (0)