Upgrade default CNB builders to Paketo Jammy

Closes gh-38477
spring-projects · Nov 21, 2023 · d1cce0f · d1cce0f
1 parent 95fbb49
commit d1cce0f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
@@ -191,8 +191,8 @@ resources:
   type: registry-image
   icon: docker
   source:
-    repository: paketobuildpacks/builder
-    tag: base
+    repository: paketobuildpacks/builder-jammy-base
+    tag: latest
 - name: artifactory-repo
   type: artifactory-resource
   icon: package-variant

diff --git a/...latform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildRequest.java b/...latform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildRequest.java
@@ -43,7 +43,7 @@
  */
 public class BuildRequest {
 
-	static final String DEFAULT_BUILDER_IMAGE_NAME = "paketobuildpacks/builder:base";
+	static final String DEFAULT_BUILDER_IMAGE_NAME = "paketobuildpacks/builder-jammy-base:latest";
 
 	private static final ImageReference DEFAULT_BUILDER = ImageReference.of(DEFAULT_BUILDER_IMAGE_NAME);
 

diff --git a/...boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/packaging-oci-image.adoc b/...boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/packaging-oci-image.adoc
@@ -105,7 +105,7 @@ The following table summarizes the available properties and their default values
 | `builder`
 | `--builder`
 | Name of the Builder image to use.
-| `paketobuildpacks/builder:base`
+| `paketobuildpacks/builder-jammy-base:latest`
 
 | `runImage`
 | `--runImage`

diff --git a/...gin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageTests.java b/...gin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageTests.java
@@ -194,7 +194,8 @@ void whenUsingDefaultConfigurationThenRequestHasPublishDisabled() {
 
 	@Test
 	void whenNoBuilderIsConfiguredThenRequestHasDefaultBuilder() {
-		assertThat(this.buildImage.createRequest().getBuilder().getName()).isEqualTo("paketobuildpacks/builder");
+		assertThat(this.buildImage.createRequest().getBuilder().getName())
+			.isEqualTo("paketobuildpacks/builder-jammy-base");
 	}
 
 	@Test

diff --git a/...-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging-oci-image.adoc b/...-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging-oci-image.adoc
@@ -115,7 +115,7 @@ The following table summarizes the available parameters and their default values
 | `builder` +
 (`spring-boot.build-image.builder`)
 | Name of the Builder image to use.
-| `paketobuildpacks/builder:base`
+| `paketobuildpacks/builder-jammy-base:latest`
 
 | `runImage` +
 (`spring-boot.build-image.runImage`)

diff --git a/...ols/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ImageTests.java b/...ols/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ImageTests.java
@@ -52,22 +52,22 @@ class ImageTests {
 	@Test
 	void getBuildRequestWhenNameIsNullDeducesName() {
 		BuildRequest request = new Image().getBuildRequest(createArtifact(), mockApplicationContent());
-		assertThat(request.getName().toString()).isEqualTo("docker.io/library/my-app:0.0.1-SNAPSHOT");
+		assertThat(request.getName()).hasToString("docker.io/library/my-app:0.0.1-SNAPSHOT");
 	}
 
 	@Test
 	void getBuildRequestWhenNameIsSetUsesName() {
 		Image image = new Image();
 		image.name = "demo";
 		BuildRequest request = image.getBuildRequest(createArtifact(), mockApplicationContent());
-		assertThat(request.getName().toString()).isEqualTo("docker.io/library/demo:latest");
+		assertThat(request.getName()).hasToString("docker.io/library/demo:latest");
 	}
 
 	@Test
 	void getBuildRequestWhenNoCustomizationsUsesDefaults() {
 		BuildRequest request = new Image().getBuildRequest(createArtifact(), mockApplicationContent());
-		assertThat(request.getName().toString()).isEqualTo("docker.io/library/my-app:0.0.1-SNAPSHOT");
-		assertThat(request.getBuilder().toString()).contains("paketobuildpacks/builder");
+		assertThat(request.getName()).hasToString("docker.io/library/my-app:0.0.1-SNAPSHOT");
+		assertThat(request.getBuilder().toString()).contains("paketobuildpacks/builder-jammy-base");
 		assertThat(request.getRunImage()).isNull();
 		assertThat(request.getEnv()).isEmpty();
 		assertThat(request.isCleanCache()).isFalse();
@@ -83,15 +83,15 @@ void getBuildRequestWhenHasBuilderUsesBuilder() {
 		Image image = new Image();
 		image.builder = "springboot/builder:2.2.x";
 		BuildRequest request = image.getBuildRequest(createArtifact(), mockApplicationContent());
-		assertThat(request.getBuilder().toString()).isEqualTo("docker.io/springboot/builder:2.2.x");
+		assertThat(request.getBuilder()).hasToString("docker.io/springboot/builder:2.2.x");
 	}
 
 	@Test
 	void getBuildRequestWhenHasRunImageUsesRunImage() {
 		Image image = new Image();
 		image.runImage = "springboot/run:latest";
 		BuildRequest request = image.getBuildRequest(createArtifact(), mockApplicationContent());
-		assertThat(request.getRunImage().toString()).isEqualTo("docker.io/springboot/run:latest");
+		assertThat(request.getRunImage()).hasToString("docker.io/springboot/run:latest");
 	}
 
 	@Test