Skip to content

Commit 7f2b917

Browse files
scottfrederickscottfrederick
committed
Merge branch '3.1.x' into 3.2.x
Closes gh-40818
2 parents 7e74577 + 70aceb2 commit 7f2b917

File tree

61 files changed

+64
-190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+64
-190
lines changed

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,8 @@ void buildsImageWithCommandLineOptions() throws IOException {
145145
writeMainClass();
146146
writeLongNameResource();
147147
BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT",
148-
"--imageName=example/test-image-cmd",
149-
"--builder=projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2",
150-
"--runImage=projects.registry.vmware.com/springboot/run:tiny-cnb", "--createdDate=2020-07-01T12:34:56Z",
148+
"--imageName=example/test-image-cmd", "--builder=ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1",
149+
"--runImage=paketobuildpacks/run-jammy-tiny", "--createdDate=2020-07-01T12:34:56Z",
151150
"--applicationDirectory=/application");
152151
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
153152
assertThat(result.getOutput()).contains("example/test-image-cmd");
@@ -489,14 +488,14 @@ private void writeBuildpackContent() throws IOException {
489488
Files.createDirectories(binDir.toPath(), dirAttribute);
490489
File descriptor = new File(buildpackDir, "buildpack.toml");
491490
try (PrintWriter writer = new PrintWriter(new FileWriter(descriptor))) {
492-
writer.println("api = \"0.2\"");
491+
writer.println("api = \"0.10\"");
493492
writer.println("[buildpack]");
494493
writer.println("id = \"example/hello-world\"");
495494
writer.println("version = \"0.0.1\"");
496495
writer.println("name = \"Hello World Buildpack\"");
497496
writer.println("homepage = \"https://github.com/buildpacks/samples/tree/main/buildpacks/hello-world\"");
498497
writer.println("[[stacks]]\n");
499-
writer.println("id = \"io.buildpacks.stacks.bionic\"");
498+
writer.println("id = \"*\"");
500499
}
501500
File detect = Files.createFile(Paths.get(binDir.getAbsolutePath(), "detect"), execFileAttribute).toFile();
502501
try (PrintWriter writer = new PrintWriter(new FileWriter(detect))) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if (project.hasProperty('applyWarPlugin')) {
88
}
99

1010
bootBuildImage {
11-
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
11+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
1212
pullPolicy = "IF_NOT_PRESENT"
1313
applicationDirectory = "/application"
1414
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
88
pullPolicy = "IF_NOT_PRESENT"
99
buildWorkspace {
1010
bind {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
88
pullPolicy = "IF_NOT_PRESENT"
99
bindings = [ "${projectDir}/bindings/ca-certificates:/platform/bindings/certificates" as String ]
1010
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
88
pullPolicy = "IF_NOT_PRESENT"
9-
buildpacks = [ "spring-boot/test-info" ]
9+
buildpacks = [ "spring-boot/spring-boot-test-info" ]
1010
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
88
pullPolicy = "IF_NOT_PRESENT"
99
buildpacks = [ "file://${projectDir}/buildpack/hello-world" as String ]
1010
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
88
pullPolicy = "IF_NOT_PRESENT"
99
buildpacks = [ "file://${projectDir}/hello-world.tgz" as String ]
1010
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
88
pullPolicy = "IF_NOT_PRESENT"
9-
buildpacks = ["projects.registry.vmware.com/springboot/test-info:latest"]
9+
buildpacks = ["ghcr.io/spring-io/spring-boot-test-info:0.0.1"]
1010
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
88
pullPolicy = "IF_NOT_PRESENT"
99
createdDate = "2020-07-01T12:34:56Z"
1010
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
88
pullPolicy = "IF_NOT_PRESENT"
99
createdDate = "now"
1010
}

0 commit comments

Comments
 (0)