Skip to content

Commit dfda192

Browse files
committed
Merge pull request #1977 from jogerj
* pr/1977: Replace deprecated noble images from buildpacks Closes gh-1977
2 parents eeb784e + 400d7e1 commit dfda192

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

start-site/src/main/java/io/spring/start/site/extension/dependency/springkafka/SpringKafkaStreamsGradleBuildCustomizer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void customize(GradleBuild build) {
4545
build.tasks().customize("bootBuildImage", (bootBuildImage) -> {
4646
if (isBoot35orLater()) {
4747
bootBuildImage.attribute("runImage",
48-
this.quote + "paketobuildpacks/ubuntu-noble-run-base:latest" + this.quote);
48+
this.quote + "paketobuildpacks/ubuntu-noble-run:latest" + this.quote);
4949
}
5050
else {
5151
bootBuildImage.attribute("builder",

start-site/src/main/java/io/spring/start/site/extension/dependency/springkafka/SpringKafkaStreamsMavenBuildCustomizer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void customize(MavenBuild build) {
4343
.add("org.springframework.boot", "spring-boot-maven-plugin",
4444
(plugin) -> plugin.configuration((configuration) -> configuration.configure("image", (image) -> {
4545
if (isBoot35orLater()) {
46-
image.add("runImage", "paketobuildpacks/ubuntu-noble-run-base:latest");
46+
image.add("runImage", "paketobuildpacks/ubuntu-noble-run:latest");
4747
}
4848
else {
4949
image.add("builder", "paketobuildpacks/builder-jammy-base:latest");

start-site/src/test/java/io/spring/start/site/extension/dependency/springkafka/SpringKafkaProjectGenerationConfigurationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void customizesBuildpacksBuilderWhenUsingMavenAndKafkaStreams() {
5757
<artifactId>spring-boot-maven-plugin</artifactId>
5858
<configuration>
5959
<image>
60-
<runImage>paketobuildpacks/ubuntu-noble-run-base:latest</runImage>
60+
<runImage>paketobuildpacks/ubuntu-noble-run:latest</runImage>
6161
</image>
6262
</configuration>
6363
</plugin>
@@ -79,7 +79,7 @@ void customizesBuildpacksBuilderWhenUsingGradleGroovyAndKafkaStreams() {
7979
ProjectRequest request = createProjectRequest("kafka-streams");
8080
assertThat(gradleBuild(request)).containsIgnoringWhitespaces("""
8181
tasks.named('bootBuildImage') {
82-
runImage = 'paketobuildpacks/ubuntu-noble-run-base:latest'
82+
runImage = 'paketobuildpacks/ubuntu-noble-run:latest'
8383
}
8484
""");
8585
}
@@ -99,7 +99,7 @@ void customizesBuildpacksBuilderWhenUsingGradleKotlinAndKafkaStreams() {
9999
ProjectRequest request = createProjectRequest("kafka-streams");
100100
assertThat(gradleKotlinDslBuild(request)).containsIgnoringWhitespaces("""
101101
tasks.bootBuildImage {
102-
runImage = "paketobuildpacks/ubuntu-noble-run-base:latest"
102+
runImage = "paketobuildpacks/ubuntu-noble-run:latest"
103103
}
104104
""");
105105
}

0 commit comments

Comments
 (0)