Merge branch '3.5.x'

Closes gh-47968

Author: philwebb

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

@@ -264,7 +264,7 @@ When using the default Paketo builder and buildpacks, the plugin instructs the b
 You can override this behavior as shown in the xref:packaging-oci-image.adoc#build-image.examples.builder-configuration[builder configuration] examples.
 
 NOTE: The default builder `paketobuildpacks/builder-noble-java-tiny:latest` contains a reduced set of system libraries and does not include a shell.
-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 `runImage` configuration to use one that includes a shell and a broader set of system libraries, such as `paketobuildpacks/ubuntu-noble-run-base:latest`.
+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 `runImage` configuration to use one that includes a shell and a broader set of system libraries, such as `paketobuildpacks/ubuntu-noble-run:latest`.
 
 
 

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

@@ -35,7 +35,7 @@ This leads to smaller images.
 
 NOTE: The CNB builder used for the images is `paketobuildpacks/builder-noble-java-tiny:latest`.
 It has a small footprint and reduced attack surface. It does not include a shell and contains a reduced set of system libraries.
-If you need more tools in the resulting image, you can use `paketobuildpacks/ubuntu-noble-run-base:latest` as the *run* image.
+If you need more tools in the resulting image, you can use `paketobuildpacks/ubuntu-noble-run:latest` as the *run* image.
 
 
 

system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle

@@ -55,6 +55,6 @@ application {
 
 bootBuildImage {
 	archiveFile = distZip.archiveFile
-	runImage = "paketobuildpacks/ubuntu-noble-run-base:latest"
+	runImage = "paketobuildpacks/ubuntu-noble-run:latest"
 	environment = ['BP_JVM_VERSION': java.targetCompatibility.getMajorVersion()]
 }

system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle

@@ -47,6 +47,6 @@ war {
 
 bootBuildImage {
 	archiveFile = war.archiveFile
-	runImage = "paketobuildpacks/ubuntu-noble-run-base:latest"
+	runImage = "paketobuildpacks/ubuntu-noble-run:latest"
 	environment = ['BP_JVM_VERSION': java.targetCompatibility.getMajorVersion(), 'BP_TOMCAT_VERSION': '11.*']
 }