Skip to content

Commit 4f672b9

Browse files
mhalbrittermhalbritter
committed
Use noble buildpacks instead of jammy
Closes gh-42711
1 parent f096707 commit 4f672b9

File tree

70 files changed

+102
-102
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+102
-102
lines changed

‎spring-boot-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/native-image/developing-your-first-application.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ This means you can just type a single command and quickly get a sensible image i
3333
The resulting image doesn't contain a JVM, instead the native image is compiled statically.
3434
This leads to smaller images.
3535

36-
NOTE: The CNB builder used for the images is `paketobuildpacks/builder-jammy-java-tiny:latest`.
36+
NOTE: The CNB builder used for the images is `paketobuildpacks/builder-noble-java-tiny:latest`.
3737
It has a small footprint and reduced attack surface. It does not include a shell and contains a reduced set of system libraries.
3838
Use `paketobuildpacks/builder-jammy-base:latest` or `paketobuildpacks/builder-jammy-full:latest` to have more tools available in the image if required.
3939

‎spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/packaging/native-image/advanced-topics.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Assuming an AOT processed Spring Boot executable jar built as `myproject-0.0.1-S
6666

6767
[source,shell]
6868
----
69-
$ pack build --builder paketobuildpacks/builder-jammy-java-tiny \
69+
$ pack build --builder paketobuildpacks/builder-noble-java-tiny \
7070
--path target/myproject-0.0.1-SNAPSHOT.jar \
7171
--env 'BP_NATIVE_IMAGE=true' \
7272
my-application:0.0.1-SNAPSHOT

‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
*/
4747
public class BuildRequest {
4848

49-
static final String DEFAULT_BUILDER_IMAGE_NAME = "paketobuildpacks/builder-jammy-java-tiny";
49+
static final String DEFAULT_BUILDER_IMAGE_NAME = "paketobuildpacks/builder-noble-java-tiny";
5050

5151
static final String DEFAULT_BUILDER_IMAGE_REF = DEFAULT_BUILDER_IMAGE_NAME + ":latest";
5252

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ void buildsImageWithCommandLineOptions() throws IOException {
161161
writeMainClass();
162162
writeLongNameResource();
163163
BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT",
164-
"--imageName=example/test-image-cmd", "--builder=ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1",
165-
"--trustBuilder", "--runImage=paketobuildpacks/run-jammy-tiny", "--createdDate=2020-07-01T12:34:56Z",
164+
"--imageName=example/test-image-cmd", "--builder=ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2",
165+
"--trustBuilder", "--runImage=paketobuildpacks/run-noble-tiny", "--createdDate=2020-07-01T12:34:56Z",
166166
"--applicationDirectory=/application");
167167
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
168168
assertThat(result.getOutput()).contains("example/test-image-cmd");
@@ -412,9 +412,9 @@ void buildsImageWithEmptySecurityOptions() throws IOException {
412412
void buildsImageOnLinuxArmWithImagePlatformLinuxArm() throws IOException {
413413
writeMainClass();
414414
writeLongNameResource();
415-
String builderImage = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1";
416-
String runImage = "docker.io/paketobuildpacks/run-jammy-tiny:latest";
417-
String buildpackImage = "ghcr.io/spring-io/spring-boot-test-info:0.0.1";
415+
String builderImage = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2";
416+
String runImage = "docker.io/paketobuildpacks/run-noble-tiny:latest";
417+
String buildpackImage = "ghcr.io/spring-io/spring-boot-test-info:0.0.2";
418418
removeImages(builderImage, runImage, buildpackImage);
419419
BuildResult result = this.gradleBuild.build("bootBuildImage");
420420
String projectName = this.gradleBuild.getProjectDir().getName();
@@ -440,9 +440,9 @@ void buildsImageOnLinuxArmWithImagePlatformLinuxArm() throws IOException {
440440
void failsWhenBuildingOnLinuxAmdWithImagePlatformLinuxArm() throws IOException {
441441
writeMainClass();
442442
writeLongNameResource();
443-
String builderImage = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1";
444-
String runImage = "docker.io/paketobuildpacks/run-jammy-tiny:latest";
445-
String buildpackImage = "ghcr.io/spring-io/spring-boot-test-info:0.0.1";
443+
String builderImage = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2";
444+
String runImage = "docker.io/paketobuildpacks/run-noble-tiny:latest";
445+
String buildpackImage = "ghcr.io/spring-io/spring-boot-test-info:0.0.2";
446446
removeImages(builderImage, runImage, buildpackImage);
447447
BuildResult result = this.gradleBuild.buildAndFail("bootBuildImage");
448448
String projectName = this.gradleBuild.getProjectDir().getName();

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
8-
runImage = "paketobuildpacks/run-jammy-tiny"
9-
buildpacks = ["ghcr.io/spring-io/spring-boot-test-info:0.0.1"]
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
8+
runImage = "paketobuildpacks/run-noble-tiny"
9+
buildpacks = ["ghcr.io/spring-io/spring-boot-test-info:0.0.2"]
1010
imagePlatform = "linux/arm64"
1111
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if (project.hasProperty('applyWarPlugin')) {
88
}
99

1010
bootBuildImage {
11-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
11+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
1212
pullPolicy = "IF_NOT_PRESENT"
1313
applicationDirectory = "/application"
1414
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
88
pullPolicy = "IF_NOT_PRESENT"
99
buildWorkspace {
1010
bind {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
88
pullPolicy = "IF_NOT_PRESENT"
99
bindings = [ "${projectDir}/bindings/ca-certificates:/platform/bindings/certificates" as String ]
1010
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
88
pullPolicy = "IF_NOT_PRESENT"
99
buildpacks = [ "spring-boot/spring-boot-test-info" ]
1010
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
88
pullPolicy = "IF_NOT_PRESENT"
99
buildpacks = [ "file://${projectDir}/buildpack/hello-world" as String ]
1010
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
88
pullPolicy = "IF_NOT_PRESENT"
99
buildpacks = [ "file://${projectDir}/hello-world.tgz" as String ]
1010
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
88
pullPolicy = "IF_NOT_PRESENT"
9-
buildpacks = ["ghcr.io/spring-io/spring-boot-test-info:0.0.1"]
9+
buildpacks = ["ghcr.io/spring-io/spring-boot-test-info:0.0.2"]
1010
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
88
pullPolicy = "IF_NOT_PRESENT"
99
createdDate = "2020-07-01T12:34:56Z"
1010
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
88
pullPolicy = "IF_NOT_PRESENT"
99
createdDate = "now"
1010
}

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

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

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

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

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

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
88
pullPolicy = "IF_NOT_PRESENT"
99
securityOptions = []
1010
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ bootJar {
88
}
99

1010
bootBuildImage {
11-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
11+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
1212
pullPolicy = "IF_NOT_PRESENT"
1313
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if (project.hasProperty('applyWarPlugin')) {
88
}
99

1010
bootBuildImage {
11-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
11+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
1212
pullPolicy = "IF_NOT_PRESENT"
1313
network = "none"
1414
}

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

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

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
88
pullPolicy = "IF_NOT_PRESENT"
99
tags = [ "example.com/myapp:latest" ]
1010
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if (project.hasProperty('applyWarPlugin')) {
88
}
99

1010
bootBuildImage {
11-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
11+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
1212
trustBuilder = true
1313
pullPolicy = "IF_NOT_PRESENT"
1414
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
88
pullPolicy = "IF_NOT_PRESENT"
99
buildWorkspace {
1010
volume {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
88
pullPolicy = "IF_NOT_PRESENT"
99
archiveFile = bootWar.archiveFile
10-
}
10+
}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
8-
runImage = "paketobuildpacks/run-jammy-tiny"
9-
buildpacks = ["ghcr.io/spring-io/spring-boot-test-info:0.0.1"]
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
8+
runImage = "paketobuildpacks/run-noble-tiny"
9+
buildpacks = ["ghcr.io/spring-io/spring-boot-test-info:0.0.2"]
1010
imagePlatform = "linux/arm64"
1111
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
88
buildCache {
99
volume {
1010
name = "build-cache-volume"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
88
pullPolicy = "IF_NOT_PRESENT"
99
environment = ["FORCE_FAILURE": "true"]
1010
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
88
pullPolicy = "IF_NOT_PRESENT"
99
buildpacks = [ "urn:cnb:builder:example/does-not-exist:0.0.1" ]
1010
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
88
pullPolicy = "IF_NOT_PRESENT"
99
createdDate = "invalid date"
1010
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
88
pullPolicy = "IF_NOT_PRESENT"
99
tags = [ "example/Invalid-Tag-Name" ]
1010
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ if (project.hasProperty('applyWarPlugin')) {
88
}
99

1010
bootBuildImage {
11-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
11+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
1212
pullPolicy = "IF_NOT_PRESENT"
1313
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
88
publish = true
99
}

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/pages/packaging-oci-image.adoc

+3-3
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,12 @@ The following table summarizes the available properties and their default values
119119
| `builder`
120120
| `--builder`
121121
| Name of the builder image to use.
122-
| `paketobuildpacks/builder-jammy-java-tiny:latest`
122+
| `paketobuildpacks/builder-noble-java-tiny:latest`
123123

124124
| `trustBuilder`
125125
| `--trustBuilder`
126126
| Whether to treat the builder as https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/concepts/trusted_builders/#what-is-a-trusted-builder[trusted].
127-
| `true` if the builder is one of `paketobuildpacks/builder-jammy-java-tiny`, `paketobuildpacks/builder-noble-java-tiny`, `paketobuildpacks/builder-jammy-tiny`, `paketobuildpacks/builder-jammy-base`, `paketobuildpacks/builder-jammy-full`, `paketobuildpacks/builder-jammy-buildpackless-tiny`, `paketobuildpacks/builder-jammy-buildpackless-base`, `paketobuildpacks/builder-jammy-buildpackless-full`, `gcr.io/buildpacks/builder`, `heroku/builder`; `false` otherwise.
127+
| `true` if the builder is one of `paketobuildpacks/builder-noble-java-tiny`, `paketobuildpacks/builder-jammy-java-tiny`, `paketobuildpacks/builder-jammy-tiny`, `paketobuildpacks/builder-jammy-base`, `paketobuildpacks/builder-jammy-full`, `paketobuildpacks/builder-jammy-buildpackless-tiny`, `paketobuildpacks/builder-jammy-buildpackless-base`, `paketobuildpacks/builder-jammy-buildpackless-full`, `gcr.io/buildpacks/builder`, `heroku/builder`; `false` otherwise.
128128

129129
| `imagePlatform`
130130
| `--imagePlatform`
@@ -251,7 +251,7 @@ NOTE: The plugin detects the target Java compatibility of the project using the
251251
When using the default Paketo builder and buildpacks, the plugin instructs the buildpacks to install the same Java version.
252252
You can override this behavior as shown in the xref:packaging-oci-image.adoc#build-image.examples.builder-configuration[builder configuration] examples.
253253

254-
NOTE: The default builder `paketobuildpacks/builder-jammy-java-tiny:latest` contains a reduced set of system libraries and does not include a shell.
254+
NOTE: The default builder `paketobuildpacks/builder-noble-java-tiny:latest` contains a reduced set of system libraries and does not include a shell.
255255
Applications that require a shell to run a start script, as might be the case when the {url-gradle-docs-application-plugin}[`application` plugin] has been applied to generate a distribution zip archive, or that depend upon a system library that is not present, should override the `builder` configuration to use one that includes a shell and a broader set of system libraries, such as `paketobuildpacks/builder-jammy-base:latest` or `paketobuildpacks/builder-jammy-full:latest`.
256256

257257

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ void whenUsingDefaultConfigurationThenRequestHasPublishDisabled() {
174174
@Test
175175
void whenNoBuilderIsConfiguredThenRequestHasDefaultBuilder() {
176176
BuildRequest request = this.buildImage.createRequest();
177-
assertThat(request.getBuilder().getName()).isEqualTo("paketobuildpacks/builder-jammy-java-tiny");
177+
assertThat(request.getBuilder().getName()).isEqualTo("paketobuildpacks/builder-noble-java-tiny");
178178
assertThat(request.isTrustBuilder()).isTrue();
179179
}
180180

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -270,9 +270,9 @@ void whenBuildImageIsInvokedWithCommandLineParameters(MavenBuild mavenBuild) {
270270
.goals("package")
271271
.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
272272
.systemProperty("spring-boot.build-image.imageName", "example.com/test/cmd-property-name:v1")
273-
.systemProperty("spring-boot.build-image.builder", "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1")
273+
.systemProperty("spring-boot.build-image.builder", "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2")
274274
.systemProperty("spring-boot.build-image.trustBuilder", "true")
275-
.systemProperty("spring-boot.build-image.runImage", "paketobuildpacks/run-jammy-tiny")
275+
.systemProperty("spring-boot.build-image.runImage", "paketobuildpacks/run-noble-tiny")
276276
.systemProperty("spring-boot.build-image.createdDate", "2020-07-01T12:34:56Z")
277277
.systemProperty("spring-boot.build-image.applicationDirectory", "/application")
278278
.execute((project) -> {
@@ -540,9 +540,9 @@ void whenBuildImageIsInvokedWithEmptySecurityOptions(MavenBuild mavenBuild) {
540540
@EnabledOnOs(value = { OS.LINUX, OS.MAC }, architectures = "aarch64",
541541
disabledReason = "Lifecycle will only run on ARM architecture")
542542
void whenBuildImageIsInvokedOnLinuxArmWithImagePlatformLinuxArm(MavenBuild mavenBuild) throws IOException {
543-
String builderImage = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1";
544-
String runImage = "docker.io/paketobuildpacks/run-jammy-tiny:latest";
545-
String buildpackImage = "ghcr.io/spring-io/spring-boot-test-info:0.0.1";
543+
String builderImage = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2";
544+
String runImage = "docker.io/paketobuildpacks/run-noble-tiny:latest";
545+
String buildpackImage = "ghcr.io/spring-io/spring-boot-test-info:0.0.2";
546546
removeImages(builderImage, runImage, buildpackImage);
547547
mavenBuild.project("dockerTest", "build-image-platform-linux-arm").goals("package").execute((project) -> {
548548
File jar = new File(project, "target/build-image-platform-linux-arm-0.0.1.BUILD-SNAPSHOT.jar");
@@ -564,9 +564,9 @@ void whenBuildImageIsInvokedOnLinuxArmWithImagePlatformLinuxArm(MavenBuild maven
564564
@EnabledOnOs(value = { OS.LINUX, OS.MAC }, architectures = "amd64",
565565
disabledReason = "The expected failure condition will not fail on ARM architectures")
566566
void failsWhenBuildImageIsInvokedOnLinuxAmdWithImagePlatformLinuxArm(MavenBuild mavenBuild) throws IOException {
567-
String builderImage = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1";
568-
String runImage = "docker.io/paketobuildpacks/run-jammy-tiny:latest";
569-
String buildpackImage = "ghcr.io/spring-io/spring-boot-test-info:0.0.1";
567+
String builderImage = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2";
568+
String runImage = "docker.io/paketobuildpacks/run-noble-tiny:latest";
569+
String buildpackImage = "ghcr.io/spring-io/spring-boot-test-info:0.0.2";
570570
removeImages(buildpackImage, runImage, buildpackImage);
571571
mavenBuild.project("dockerTest", "build-image-platform-linux-arm")
572572
.goals("package")

0 commit comments

Comments
 (0)