Merge branch '3.2.x'

Closes gh-40819
spring-projects · May 17, 2024 · 48632b2 · 48632b2
2 parents daa5db8 + 7f2b917
commit 48632b2
Show file tree

Hide file tree

Showing 61 changed files with 64 additions and 190 deletions.
diff --git a/...t/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java b/...t/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java
@@ -145,9 +145,8 @@ void buildsImageWithCommandLineOptions() throws IOException {
 		writeMainClass();
 		writeLongNameResource();
 		BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT",
-				"--imageName=example/test-image-cmd",
-				"--builder=projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2",
-				"--runImage=projects.registry.vmware.com/springboot/run:tiny-cnb", "--createdDate=2020-07-01T12:34:56Z",
+				"--imageName=example/test-image-cmd", "--builder=ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1",
+				"--runImage=paketobuildpacks/run-jammy-tiny", "--createdDate=2020-07-01T12:34:56Z",
 				"--applicationDirectory=/application");
 		assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
 		assertThat(result.getOutput()).contains("example/test-image-cmd");
@@ -489,14 +488,14 @@ private void writeBuildpackContent() throws IOException {
 		Files.createDirectories(binDir.toPath(), dirAttribute);
 		File descriptor = new File(buildpackDir, "buildpack.toml");
 		try (PrintWriter writer = new PrintWriter(new FileWriter(descriptor))) {
-			writer.println("api = \"0.2\"");
+			writer.println("api = \"0.10\"");
 			writer.println("[buildpack]");
 			writer.println("id = \"example/hello-world\"");
 			writer.println("version = \"0.0.1\"");
 			writer.println("name = \"Hello World Buildpack\"");
 			writer.println("homepage = \"https://github.com/buildpacks/samples/tree/main/buildpacks/hello-world\"");
 			writer.println("[[stacks]]\n");
-			writer.println("id = \"io.buildpacks.stacks.bionic\"");
+			writer.println("id = \"*\"");
 		}
 		File detect = Files.createFile(Paths.get(binDir.getAbsolutePath(), "detect"), execFileAttribute).toFile();
 		try (PrintWriter writer = new PrintWriter(new FileWriter(detect))) {

diff --git a/.../tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithApplicationDirectory.gradle b/.../tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithApplicationDirectory.gradle
@@ -8,7 +8,7 @@ if (project.hasProperty('applyWarPlugin')) {
 }
 
 bootBuildImage {
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
 	applicationDirectory = "/application"
 }
diff --git a/...oot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBindCaches.gradle b/...oot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBindCaches.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 bootBuildImage {
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
 	buildWorkspace {
 		bind {

diff --git a/...k/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBinding.gradle b/...k/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBinding.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 bootBuildImage {
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
 	bindings = [ "${projectDir}/bindings/ca-certificates:/platform/bindings/certificates" as String ]
 }
diff --git a/.../tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromBuilder.gradle b/.../tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromBuilder.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 bootBuildImage {
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
-	buildpacks = [ "spring-boot/test-info" ]
+	buildpacks = [ "spring-boot/spring-boot-test-info" ]
 }
diff --git a/...asks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromDirectory.gradle b/...asks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromDirectory.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 bootBuildImage {
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
 	buildpacks = [ "file://${projectDir}/buildpack/hello-world" as String ]
 }
diff --git a/.../tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromTarGzip.gradle b/.../tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromTarGzip.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 bootBuildImage {
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
 	buildpacks = [ "file://${projectDir}/hello-world.tgz" as String ]
 }
diff --git a/.../tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpacksFromImages.gradle b/.../tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpacksFromImages.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 bootBuildImage {
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
-	buildpacks = ["projects.registry.vmware.com/springboot/test-info:latest"]
+	buildpacks = ["ghcr.io/spring-io/spring-boot-test-info:0.0.1"]
 }
diff --git a/...ot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCreatedDate.gradle b/...ot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCreatedDate.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 bootBuildImage {
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
 	createdDate = "2020-07-01T12:34:56Z"
 }
diff --git a/...le/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCurrentCreatedDate.gradle b/...le/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCurrentCreatedDate.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 bootBuildImage {
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
 	createdDate = "now"
 }
diff --git a/...ks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomBuilderAndRunImage.gradle b/...ks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomBuilderAndRunImage.gradle
@@ -5,7 +5,7 @@ plugins {
 
 bootBuildImage {
 	imageName = "example/test-image-custom"
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
-	runImage = "projects.registry.vmware.com/springboot/run:tiny-cnb"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
+	runImage = "paketobuildpacks/run-jammy-tiny"
 	pullPolicy = "IF_NOT_PRESENT"
 }
diff --git a/...oot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomName.gradle b/...oot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomName.gradle
@@ -5,6 +5,6 @@ plugins {
 
 bootBuildImage {
 	imageName = "example/test-image-name"
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
 }
diff --git a/.../tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithEmptySecurityOptions.gradle b/.../tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithEmptySecurityOptions.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 bootBuildImage {
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
 	securityOptions = []
 }
diff --git a/...t/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithLaunchScript.gradle b/...t/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithLaunchScript.gradle
@@ -8,6 +8,6 @@ bootJar {
 }
 
 bootBuildImage {
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
 }
diff --git a/...radle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithNetworkModeNone.gradle b/...radle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithNetworkModeNone.gradle
@@ -8,7 +8,7 @@ if (project.hasProperty('applyWarPlugin')) {
 }
 
 bootBuildImage {
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
 	network = "none"
 }
diff --git a/...oot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithPullPolicy.gradle b/...oot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithPullPolicy.gradle
@@ -10,6 +10,6 @@ if (project.hasProperty('applyWarPlugin')) {
 }
 
 bootBuildImage {
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	pullPolicy = PullPolicy.ALWAYS
 }
diff --git a/...ework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithTag.gradle b/...ework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithTag.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 bootBuildImage {
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
 	tags = [ "example.com/myapp:latest" ]
 }
diff --git a/...t/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithVolumeCaches.gradle b/...t/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithVolumeCaches.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 bootBuildImage {
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
 	buildWorkspace {
 		volume {

diff --git a/...ling/BootBuildImageIntegrationTests-buildsImageWithWarPackagingAndJarConfiguration.gradle b/...ling/BootBuildImageIntegrationTests-buildsImageWithWarPackagingAndJarConfiguration.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 bootBuildImage {
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
 	archiveFile = bootWar.archiveFile
 }
diff --git a/...le/tasks/bundling/BootBuildImageIntegrationTests-failsWhenCachesAreConfiguredTwice.gradle b/...le/tasks/bundling/BootBuildImageIntegrationTests-failsWhenCachesAreConfiguredTwice.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 bootBuildImage {
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	buildCache {
 		volume {
 			name = "build-cache-volume"

diff --git a/...rk/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuilderError.gradle b/...rk/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuilderError.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 bootBuildImage {
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
 	environment = ["FORCE_FAILURE": "true"]
 }
diff --git a/...radle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuildpackNotInBuilder.gradle b/...radle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuildpackNotInBuilder.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 bootBuildImage {
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
 	buildpacks = [ "urn:cnb:builder:example/does-not-exist:0.0.1" ]
 }
diff --git a/...t/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidCreatedDate.gradle b/...t/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidCreatedDate.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 bootBuildImage {
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
 	createdDate = "invalid date"
 }
diff --git a/...work/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidTag.gradle b/...work/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidTag.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 bootBuildImage {
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
 	tags = [ "example/Invalid-Tag-Name" ]
 }
diff --git a/...rces/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.gradle b/...rces/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.gradle
@@ -8,6 +8,6 @@ if (project.hasProperty('applyWarPlugin')) {
 }
 
 bootBuildImage {
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	pullPolicy = "IF_NOT_PRESENT"
 }
diff --git a/.../springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.gradle b/.../springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.gradle
@@ -4,6 +4,6 @@ plugins {
 }
 
 bootBuildImage {
-	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
 	publish = true
 }
diff --git a/...ng-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageTests.java b/...ng-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageTests.java
@@ -247,9 +247,8 @@ void whenBuildImageIsInvokedWithCommandLineParameters(MavenBuild mavenBuild) {
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.systemProperty("spring-boot.build-image.imageName", "example.com/test/cmd-property-name:v1")
-			.systemProperty("spring-boot.build-image.builder",
-					"projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2")
-			.systemProperty("spring-boot.build-image.runImage", "projects.registry.vmware.com/springboot/run:tiny-cnb")
+			.systemProperty("spring-boot.build-image.builder", "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1")
+			.systemProperty("spring-boot.build-image.runImage", "paketobuildpacks/run-jammy-tiny")
 			.systemProperty("spring-boot.build-image.createdDate", "2020-07-01T12:34:56Z")
 			.systemProperty("spring-boot.build-image.applicationDirectory", "/application")
 			.execute((project) -> {

diff --git a/...ring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-app-dir/pom.xml b/...ring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-app-dir/pom.xml
@@ -23,7 +23,7 @@
 						</goals>
 						<configuration>
 							<image>
-								<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
+								<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
 								<applicationDirectory>/application</applicationDirectory>
 							</image>
 						</configuration>

diff --git a/...oot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bad-buildpack/pom.xml b/...oot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bad-buildpack/pom.xml
@@ -23,7 +23,7 @@
 						</goals>
 						<configuration>
 							<image>
-								<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
+								<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
 								<buildpacks>
 									<buildpack>urn:cnb:builder:example/does-not-exist:0.0.1</buildpack>
 								</buildpacks>

diff --git a/...-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bind-caches/pom.xml b/...-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bind-caches/pom.xml
@@ -23,7 +23,7 @@
 						</goals>
 						<configuration>
 							<image>
-								<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
+								<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
 								<buildWorkspace>
 									<bind>
 										<source>${java.io.tmpdir}/junit-image-cache-${test-build-id}-work</source>

diff --git a/...ing-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bindings/pom.xml b/...ing-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bindings/pom.xml
@@ -23,7 +23,7 @@
 						</goals>
 						<configuration>
 							<image>
-								<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
+								<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
 								<bindings>
 									<binding>${basedir}/bindings/ca-certificates:/platform/bindings/ca-certificates</binding>
 								</bindings>

diff --git a/...oot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-builder-error/pom.xml b/...oot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-builder-error/pom.xml
@@ -23,7 +23,7 @@
 						</goals>
 						<configuration>
 							<image>
-								<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
+								<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
 								<env>
 									<FORCE_FAILURE>true</FORCE_FAILURE>
 								</env>

diff --git a/...t-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-caches-multiple/pom.xml b/...t-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-caches-multiple/pom.xml
@@ -23,7 +23,7 @@
 						</goals>
 						<configuration>
 							<image>
-								<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
+								<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
 								<buildCache>
 									<volume>
 										<name>build-cache-volume1</name>

diff --git a/...ot-maven-plugin/src/intTest/projects/build-image-classifier-source-with-repackage/pom.xml b/...ot-maven-plugin/src/intTest/projects/build-image-classifier-source-with-repackage/pom.xml
@@ -45,7 +45,7 @@
 						</goals>
 						<configuration>
 							<image>
-								<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
+								<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
 							</image>
 						</configuration>
 					</execution>

diff --git a/...tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-source/pom.xml b/...tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-source/pom.xml
@@ -39,7 +39,7 @@
 						</goals>
 						<configuration>
 							<image>
-								<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
+								<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
 							</image>
 						</configuration>
 					</execution>

diff --git a/...ring-boot-maven-plugin/src/intTest/projects/build-image-classifier-with-repackage/pom.xml b/...ring-boot-maven-plugin/src/intTest/projects/build-image-classifier-with-repackage/pom.xml
@@ -29,7 +29,7 @@
 						</goals>
 						<configuration>
 							<image>
-								<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
+								<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
 							</image>
 						</configuration>
 					</execution>

diff --git a/...g-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier/pom.xml b/...g-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier/pom.xml
@@ -23,7 +23,7 @@
 						</goals>
 						<configuration>
 							<image>
-								<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
+								<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
 							</image>
 						</configuration>
 					</execution>

diff --git a/...ing-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-cmd-line/pom.xml b/...ing-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-cmd-line/pom.xml
@@ -19,7 +19,7 @@
 					<version>@project.version@</version>
 					<configuration>
 						<image>
-							<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
+							<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
 						</image>
 					</configuration>
 				</plugin>

diff --git a/...boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-created-date/pom.xml b/...boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-created-date/pom.xml
@@ -23,7 +23,7 @@
 						</goals>
 						<configuration>
 							<image>
-								<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
+								<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
 								<createdDate>2020-07-01T12:34:56Z</createdDate>
 							</image>
 						</configuration>

diff --git a/...ls/spring-boot-maven-plugin/src/intTest/projects/build-image-current-created-date/pom.xml b/...ls/spring-boot-maven-plugin/src/intTest/projects/build-image-current-created-date/pom.xml
@@ -23,7 +23,7 @@
 						</goals>
 						<configuration>
 							<image>
-								<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
+								<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
 								<createdDate>now</createdDate>
 							</image>
 						</configuration>

diff --git a/...ot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-builder/pom.xml b/...ot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-builder/pom.xml
@@ -23,8 +23,8 @@
 						</goals>
 						<configuration>
 							<image>
-								<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
-								<runImage>projects.registry.vmware.com/springboot/run:tiny-cnb</runImage>
+								<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
+								<runImage>paketobuildpacks/run-jammy-tiny</runImage>
 							</image>
 						</configuration>
 					</execution>