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 index 2a2238c4a9e..3ef2e777f2f 100644 --- 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 @@ class BootBuildImageIntegrationTests { 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 @@ class BootBuildImageIntegrationTests { 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 index 01993dd7e75..35523d19bd1 100644 --- 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 index 28c1feb2463..c35d5fdced8 100644 --- 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 index 20b9bcf689b..9e75218ed3f 100644 --- 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 index 346c1845710..e3d73369a2b 100644 --- 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 index 274494fd3b7..94964d9ab7b 100644 --- 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 index a271b613572..9e2c564581a 100644 --- 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 index e2b8cdc67c6..1114af1ea55 100644 --- 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 index 11400e42619..b264e85c25e 100644 --- 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 index 38e40757f48..30e56a4c60e 100644 --- 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 index 6e48d8872f2..d43e7897bbb 100644 --- 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 index 98eafe4e33f..ae6e69667ab 100644 --- 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 index ecb021bfdd0..f630f5247cb 100644 --- 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 index 700a043d27b..3151af716cd 100644 --- 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 index 35f877d84f6..a45b3de7fea 100644 --- 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 index d416020ccd2..2de6151f89f 100644 --- 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 index 3ca72dd5895..39a8a5dd6af 100644 --- 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 } \ No newline at end of file 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 index f421a19e7c1..2554ec6fc03 100644 --- 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 index dfa84603d15..d869f8bcbf7 100644 --- 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 index 27b9facfd3c..0b25b2a2a83 100644 --- 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 index fccae838bfe..7afdedfb004 100644 --- 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 index 08cb7a1ab99..186a5f23b4f 100644 --- 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 index 5ba1162191e..e23d844d066 100644 --- 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 index 1134648e852..c30e89c9b9f 100644 --- 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 index b80cdc0bc44..d17f7b5f7d0 100644 --- 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 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { .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 index 4485ef555c8..03e500bd464 100644 --- 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 @@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 /application 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 index 23544a5ac98..36310c7e5c4 100644 --- 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 @@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 urn:cnb:builder:example/does-not-exist:0.0.1 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 index 1435bce3164..515524ab8d7 100644 --- 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 @@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 ${basedir}/bindings/ca-certificates:/platform/bindings/ca-certificates 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 index 5695aa6843b..d521c0b527e 100644 --- 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 @@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 true 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 index 54db991bb65..6b7b75b49dc 100644 --- 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 @@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 build-cache-volume1 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 index f95eb39f874..0d483fcb38d 100644 --- 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 @@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 cache-${test-build-id}.build 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 index 1781d5aaa4c..d2686d79500 100644 --- 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 @@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 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 index b0de38b46c5..8aed373bcfc 100644 --- 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 @@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 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 index 40c95a1b2e4..ff3c44348a3 100644 --- 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 @@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 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 index 3fa3f66639e..dedb7d01438 100644 --- 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 @@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 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 index d2d3acb6522..00bfc635008 100644 --- 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 @@ @project.version@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 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 index 5dc2dc8b16c..225122fcc2d 100644 --- 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 @@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 2020-07-01T12:34:56Z 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 index 09624ddf10b..ca445f400f8 100644 --- 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 @@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 now 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 index d86573b86a2..a404e10815e 100644 --- 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 @@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 - projects.registry.vmware.com/springboot/run:tiny-cnb + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + paketobuildpacks/run-jammy-tiny 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 index a03238d5f72..949533432a3 100644 --- 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 @@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 - urn:cnb:builder:spring-boot/test-info + urn:cnb:builder:spring-boot/spring-boot-test-info 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 index 83f84956e6e..50b294e92bd 100644 --- 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 @@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 example.com/test/build-image:${project.version} 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 index 519d7fdb6cf..ee5cd382080 100644 --- 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 @@ -23,7 +23,7 @@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 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 index 8e302d04b24..7254dddfdfc 100644 --- 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 @@ -25,7 +25,7 @@ final-name - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 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 index c6f13bd46f5..536e027bb9f 100644 --- 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 @@ -31,7 +31,7 @@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 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 index 77abe93a83d..6e975034b5c 100644 --- 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 @@ -23,7 +23,7 @@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 none 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 index 1633e249f31..627043f4dd5 100644 --- 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 @@ -23,7 +23,7 @@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 true 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 index 7117b9a3484..ffa74844e73 100644 --- 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 @@ -23,7 +23,7 @@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 ${project.artifactId}:latest 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 index 9fdc2795c0d..6f0fe67b038 100644 --- 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 @@ -24,7 +24,7 @@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 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 index 9ccb262c104..0d3aa5a307a 100644 --- 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 @@ -29,7 +29,7 @@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 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 index 1eed54562f1..29fb2782f09 100644 --- 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 @@ -26,7 +26,7 @@ ZIP - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 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 index fba71758e43..5264475c038 100644 --- 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 @@ -23,7 +23,7 @@ - projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 diff --git a/src/spring-boot-builder/README.adoc b/src/spring-boot-builder/README.adoc deleted file mode 100644 index 35de5526521..00000000000 --- a/src/spring-boot-builder/README.adoc +++ /dev/null @@ -1,10 +0,0 @@ -= Spring Boot Test Builder - -This directory contains a Cloud Native Buildpacks https://buildpacks.io/docs/concepts/components/builder/[builder] and https://buildpacks.io/docs/concepts/components/buildpack/[buildpack] that is used by integration tests to verify the behavior of the Spring Boot build plugins. - -== Creating the builder - -* Install the https://buildpacks.io/docs/install-pack/[pack CLI] -* Authenticate to projects.registry.vmware.com through `docker login` -* Use the `build.sh` create the necessary images and push them to the registry - diff --git a/src/spring-boot-builder/build.sh b/src/spring-boot-builder/build.sh deleted file mode 100755 index 606638a568d..00000000000 --- a/src/spring-boot-builder/build.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash -set -x -eo pipefail - -docker pull paketobuildpacks/build:tiny-cnb -docker tag paketobuildpacks/build:tiny-cnb projects.registry.vmware.com/springboot/build:tiny-cnb -docker push projects.registry.vmware.com/springboot/build:tiny-cnb - -docker pull paketobuildpacks/run:tiny-cnb -docker tag paketobuildpacks/run:tiny-cnb projects.registry.vmware.com/springboot/run:tiny-cnb -docker push projects.registry.vmware.com/springboot/run:tiny-cnb - -cd builder -pack builder create projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 --config builder.toml -docker push projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2 -cd - diff --git a/src/spring-boot-builder/builder/builder.toml b/src/spring-boot-builder/builder/builder.toml deleted file mode 100644 index 302ebbbe165..00000000000 --- a/src/spring-boot-builder/builder/builder.toml +++ /dev/null @@ -1,21 +0,0 @@ -# Buildpacks to include in builder -[[buildpacks]] -id = "spring-boot/test-info" -version = "0.0.2" -uri = "../buildpacks/test-info" - -# Order used for detection -[[order]] -[[order.group]] -id = "spring-boot/test-info" -version = "0.0.2" - -# Stack that will be used by the builder -[stack] -id = "io.paketo.stacks.tiny" -build-image = "projects.registry.vmware.com/springboot/build:tiny-cnb" -run-image = "projects.registry.vmware.com/springboot/run:tiny-cnb" - -# Lifecycle executable version that will be used by the builder -[lifecycle] -version = "0.15.3" \ No newline at end of file diff --git a/src/spring-boot-builder/buildpacks/test-info/bin/build b/src/spring-boot-builder/buildpacks/test-info/bin/build deleted file mode 100755 index 8c1dce7774a..00000000000 --- a/src/spring-boot-builder/buildpacks/test-info/bin/build +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash -set -eo pipefail - -echo "---> Test Info buildpack building" - -# INPUT ARGUMENTS -platform_dir=$2 -env_dir=${platform_dir}/env -bindings_dir=${platform_dir}/bindings - -if [[ -f ${env_dir}/FORCE_FAILURE ]]; then - echo "Forced builder failure" - exit 1 -fi - -if compgen -G "${env_dir}/*" > /dev/null; then - for var in ${env_dir}/*; do - echo "env: $(basename ${var})=$(<${var})" - done -fi - -if compgen -G "${bindings_dir}/*" > /dev/null; then - for binding in ${bindings_dir}/*; do - for f in ${binding}/*; do - echo "binding: $(basename ${binding})/$(basename ${f})=$(<${f})" - done - done -fi - -echo "META-INF/MANIFEST.MF: " -if [[ -f META-INF/MANIFEST.MF ]]; then - cat META-INF/MANIFEST.MF -fi - -echo "Network status: $(curl --silent --head https://spring.io | grep -E '^HTTP' || echo "curl failed")" - -echo "---> Test Info buildpack done" diff --git a/src/spring-boot-builder/buildpacks/test-info/bin/detect b/src/spring-boot-builder/buildpacks/test-info/bin/detect deleted file mode 100755 index f7e1c76ebcc..00000000000 --- a/src/spring-boot-builder/buildpacks/test-info/bin/detect +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash -set -eo pipefail - -# 1. CHECK IF APPLICABLE -if [[ ! -f META-INF/MANIFEST.MF ]]; then - exit 100 -fi - -# 2. GET ARGS -plan_path=$2 - -# 3. DECLARE DEPENDENCIES (OPTIONAL) -cat >> "${plan_path}" <