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

+4-5
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

+1-1
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

+1-1
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

+1-1
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

+2-2
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

+1-1
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

+1-1
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

+2-2
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

+1-1
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

+1-1
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
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55

66
bootBuildImage {
77
imageName = "example/test-image-custom"
8-
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
9-
runImage = "projects.registry.vmware.com/springboot/run:tiny-cnb"
8+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
9+
runImage = "paketobuildpacks/run-jammy-tiny"
1010
pullPolicy = "IF_NOT_PRESENT"
1111
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ plugins {
55

66
bootBuildImage {
77
imageName = "example/test-image-name"
8-
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
8+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
99
pullPolicy = "IF_NOT_PRESENT"
1010
}

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

+1-1
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
securityOptions = []
1010
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ bootJar {
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
}

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

+1-1
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
network = "none"
1414
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ if (project.hasProperty('applyWarPlugin')) {
1010
}
1111

1212
bootBuildImage {
13-
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
13+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
1414
pullPolicy = PullPolicy.ALWAYS
1515
}

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

+1-1
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
tags = [ "example.com/myapp:latest" ]
1010
}

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

+1-1
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
volume {

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

+1-1
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
archiveFile = bootWar.archiveFile
1010
}

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

+1-1
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
buildCache {
99
volume {
1010
name = "build-cache-volume"

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

+1-1
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
environment = ["FORCE_FAILURE": "true"]
1010
}

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

+1-1
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 = [ "urn:cnb:builder:example/does-not-exist:0.0.1" ]
1010
}

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

+1-1
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 = "invalid date"
1010
}

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

+1-1
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
tags = [ "example/Invalid-Tag-Name" ]
1010
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ 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
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ 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
publish = true
99
}

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageTests.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,8 @@ void whenBuildImageIsInvokedWithCommandLineParameters(MavenBuild mavenBuild) {
247247
.goals("package")
248248
.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
249249
.systemProperty("spring-boot.build-image.imageName", "example.com/test/cmd-property-name:v1")
250-
.systemProperty("spring-boot.build-image.builder",
251-
"projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2")
252-
.systemProperty("spring-boot.build-image.runImage", "projects.registry.vmware.com/springboot/run:tiny-cnb")
250+
.systemProperty("spring-boot.build-image.builder", "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1")
251+
.systemProperty("spring-boot.build-image.runImage", "paketobuildpacks/run-jammy-tiny")
253252
.systemProperty("spring-boot.build-image.createdDate", "2020-07-01T12:34:56Z")
254253
.systemProperty("spring-boot.build-image.applicationDirectory", "/application")
255254
.execute((project) -> {

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-app-dir/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</goals>
2424
<configuration>
2525
<image>
26-
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
26+
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
2727
<applicationDirectory>/application</applicationDirectory>
2828
</image>
2929
</configuration>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bad-buildpack/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</goals>
2424
<configuration>
2525
<image>
26-
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
26+
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
2727
<buildpacks>
2828
<buildpack>urn:cnb:builder:example/does-not-exist:0.0.1</buildpack>
2929
</buildpacks>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bind-caches/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</goals>
2424
<configuration>
2525
<image>
26-
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
26+
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
2727
<buildWorkspace>
2828
<bind>
2929
<source>${java.io.tmpdir}/junit-image-cache-${test-build-id}-work</source>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bindings/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</goals>
2424
<configuration>
2525
<image>
26-
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
26+
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
2727
<bindings>
2828
<binding>${basedir}/bindings/ca-certificates:/platform/bindings/ca-certificates</binding>
2929
</bindings>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-builder-error/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</goals>
2424
<configuration>
2525
<image>
26-
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
26+
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
2727
<env>
2828
<FORCE_FAILURE>true</FORCE_FAILURE>
2929
</env>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-caches-multiple/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</goals>
2424
<configuration>
2525
<image>
26-
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
26+
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
2727
<buildCache>
2828
<volume>
2929
<name>build-cache-volume1</name>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-source-with-repackage/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</goals>
4646
<configuration>
4747
<image>
48-
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
48+
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
4949
</image>
5050
</configuration>
5151
</execution>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-source/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</goals>
4040
<configuration>
4141
<image>
42-
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
42+
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
4343
</image>
4444
</configuration>
4545
</execution>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-with-repackage/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</goals>
3030
<configuration>
3131
<image>
32-
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
32+
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
3333
</image>
3434
</configuration>
3535
</execution>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</goals>
2424
<configuration>
2525
<image>
26-
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
26+
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
2727
</image>
2828
</configuration>
2929
</execution>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-cmd-line/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<version>@project.version@</version>
2020
<configuration>
2121
<image>
22-
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
22+
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
2323
</image>
2424
</configuration>
2525
</plugin>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-created-date/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</goals>
2424
<configuration>
2525
<image>
26-
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
26+
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
2727
<createdDate>2020-07-01T12:34:56Z</createdDate>
2828
</image>
2929
</configuration>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-current-created-date/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</goals>
2424
<configuration>
2525
<image>
26-
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
26+
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
2727
<createdDate>now</createdDate>
2828
</image>
2929
</configuration>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-builder/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
</goals>
2424
<configuration>
2525
<image>
26-
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
27-
<runImage>projects.registry.vmware.com/springboot/run:tiny-cnb</runImage>
26+
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
27+
<runImage>paketobuildpacks/run-jammy-tiny</runImage>
2828
</image>
2929
</configuration>
3030
</execution>

0 commit comments

Comments
 (0)