Merge branch '3.1.x'

Closes gh-36691

spring-boot-project/spring-boot-docs/src/docs/asciidoc/container-images/cloud-native-buildpacks.adoc

@@ -12,7 +12,7 @@ This means you can just type a single command and quickly get a sensible image i
 
 See the individual plugin documentation on how to use buildpacks with {spring-boot-maven-plugin-docs}#build-image[Maven] and {spring-boot-gradle-plugin-docs}#build-image[Gradle].
 
-NOTE: The https://github.com/paketo-buildpacks/spring-boot[Paketo Spring Boot buildpack] has also been updated to support the `layers.idx` file so any customization that is applied to it will be reflected in the image created by the buildpack.
+NOTE: The https://github.com/paketo-buildpacks/spring-boot[Paketo Spring Boot buildpack] supports the `layers.idx` file, so any customization that is applied to it will be reflected in the image created by the buildpack.
 
 NOTE: In order to achieve reproducible builds and container image caching, Buildpacks can manipulate the application resources metadata (such as the file "last modified" information).
 You should ensure that your application does not rely on that metadata at runtime.

spring-boot-project/spring-boot-docs/src/docs/asciidoc/native-image/advanced-topics.adoc

@@ -62,7 +62,7 @@ Assuming an AOT processed Spring Boot executable jar built as `myproject-0.0.1-S
 
 [source,shell,indent=0,subs="verbatim"]
 ----
-	$ pack build --builder paketobuildpacks/builder:tiny \
+	$ pack build --builder paketobuildpacks/builder-jammy-tiny \
 	    --path target/myproject-0.0.1-SNAPSHOT.jar \
 	    --env 'BP_NATIVE_IMAGE=true' \
 	    my-application:0.0.1-SNAPSHOT

spring-boot-project/spring-boot-docs/src/docs/asciidoc/native-image/developing-your-first-application.adoc

@@ -33,7 +33,7 @@ The resulting image doesn't contain a JVM, instead the native image is compiled
 This leads to smaller images.
 
 NOTE: The builder used for the images is `paketobuildpacks/builder:tiny`.
-It has small footprint and reduced attack surface, but you can also use `paketobuildpacks/builder:base` or `paketobuildpacks/builder:full` to have more tools available in the image if required.
+It has small footprint and reduced attack surface, but you can also use `paketobuildpacks/builder-jammy-base` or `paketobuildpacks/builder-jammy-full` to have more tools available in the image if required.