Relocate test CNB builder and buildpack

scottfrederick · scottfrederick · commit 70aceb21eb19 · 2024-05-17T10:59:41.000-05:00
The test CNB builder and buildpack used in integration tests have moved from a projects.registry.vmware.com registry to ghcr.io/spring-io. This commit modifies tests to use the new location. Closes gh-40800
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java
@@ -143,9 +143,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");
@@ -443,14 +442,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/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithApplicationDirectory.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/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/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBinding.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/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/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromBuilder.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/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/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromDirectory.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/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/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromTarGzip.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/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/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpacksFromImages.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/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/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCreatedDate.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/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/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCurrentCreatedDate.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/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/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomBuilderAndRunImage.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/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/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomName.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/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/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithLaunchScript.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/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/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithNetworkModeNone.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/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/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithPullPolicy.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/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/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithTag.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/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/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithVolumeCaches.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/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"
 	buildCache {
 		volume {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithWarPackagingAndJarConfiguration.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/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/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWhenCachesAreConfiguredTwice.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/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-volume1"
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuilderError.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/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/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuildpackNotInBuilder.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/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/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidCreatedDate.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/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/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidTag.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/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/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/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/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/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/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageTests.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageTests.java
@@ -245,9 +245,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/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-app-dir/pom.xml b/spring-boot-project/spring-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/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bad-buildpack/pom.xml b/spring-boot-project/spring-boot-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/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bindings/pom.xml b/spring-boot-project/spring-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/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-builder-error/pom.xml b/spring-boot-project/spring-boot-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/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-caches-multiple/pom.xml b/spring-boot-project/spring-boot-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/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-caches/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-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>
 								<buildCache>
 									<volume>
 										<name>cache-${test-build-id}.build</name>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-source-with-repackage/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-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/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-source/pom.xml b/spring-boot-project/spring-boot-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/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-with-repackage/pom.xml b/spring-boot-project/spring-boot-tools/spring-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/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier/pom.xml b/spring-boot-project/spring-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/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-cmd-line/pom.xml b/spring-boot-project/spring-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/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-created-date/pom.xml b/spring-boot-project/spring-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/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-current-created-date/pom.xml b/spring-boot-project/spring-boot-tools/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/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-builder/pom.xml b/spring-boot-project/spring-boot-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>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-buildpacks/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-buildpacks/pom.xml
@@ -23,9 +23,9 @@
 						</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:spring-boot/test-info</buildpack>
+									<buildpack>urn:cnb:builder:spring-boot/spring-boot-test-info</buildpack>
 								</buildpacks>
 							</image>
 						</configuration>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-name/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-name/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>
 								<name>example.com/test/build-image:${project.version}</name>
 							</image>
 						</configuration>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-empty-env-entry/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-empty-env-entry/pom.xml
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-final-name/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-final-name/pom.xml
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-multi-module/app/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-multi-module/app/pom.xml
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-network/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-network/pom.xml
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-publish/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-publish/pom.xml
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-tags/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-tags/pom.xml
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-war-packaging/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-war-packaging/pom.xml
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-with-repackage/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-with-repackage/pom.xml
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-zip-packaging/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-zip-packaging/pom.xml
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image/pom.xml
diff --git a/src/spring-boot-builder/README.adoc b/src/spring-boot-builder/README.adoc
diff --git a/src/spring-boot-builder/build.sh b/src/spring-boot-builder/build.sh
diff --git a/src/spring-boot-builder/builder/builder.toml b/src/spring-boot-builder/builder/builder.toml
diff --git a/src/spring-boot-builder/buildpacks/test-info/bin/build b/src/spring-boot-builder/buildpacks/test-info/bin/build
diff --git a/src/spring-boot-builder/buildpacks/test-info/bin/detect b/src/spring-boot-builder/buildpacks/test-info/bin/detect
diff --git a/src/spring-boot-builder/buildpacks/test-info/buildpack.toml b/src/spring-boot-builder/buildpacks/test-info/buildpack.toml

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ if (project.hasProperty('applyWarPlugin')) {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`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"`
`12`	`12`	`pullPolicy = "IF_NOT_PRESENT"`
`13`	`13`	`applicationDirectory = "/application"`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`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"`
`8`	`8`	`pullPolicy = "IF_NOT_PRESENT"`
`9`	`9`	`bindings = [ "${projectDir}/bindings/ca-certificates:/platform/bindings/certificates" as String ]`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ plugins {`
`5`	`5`
`6`	`6`	`bootBuildImage {`
`7`	`7`	`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"`
`10`	`10`	`pullPolicy = "IF_NOT_PRESENT"`
`11`	`11`	`}`