Merge branch '3.0.x' into 3.1.x

Closes gh-36850

Author: snicoll

spring-boot-project/spring-boot-docs/src/docs/asciidoc/deployment/cloud.adoc

@@ -365,11 +365,7 @@ This https://spring.io/guides/gs/spring-boot-for-azure/[Getting Started guide] w
 Google Cloud has several options that can be used to launch Spring Boot applications.
 The easiest to get started with is probably App Engine, but you could also find ways to run Spring Boot in a container with Container Engine or on a virtual machine with Compute Engine.
 
-To run in App Engine, you can create a project in the UI first, which sets up a unique identifier for you and also sets up HTTP routes.
-Add a Java app to the project and leave it empty and then use the https://cloud.google.com/sdk/install[Google Cloud SDK] to push your Spring Boot app into that slot from the command line or CI build.
-
-App Engine Standard requires you to use WAR packaging.
-Follow https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/appengine-java8/springboot-helloworld/README.md[these steps] to deploy App Engine Standard application to Google Cloud.
+To deploy your first app to App Engine standard environment, follow https://codelabs.developers.google.com/codelabs/cloud-app-engine-springboot#0[this tutorial].
 
 Alternatively, App Engine Flex requires you to create an `app.yaml` file to describe the resources your app requires.
 Normally, you put this file in `src/main/appengine`, and it should resemble the following file:
@@ -378,12 +374,9 @@ Normally, you put this file in `src/main/appengine`, and it should resemble the
 ----
 	service: "default"
 
-	runtime: "java"
+	runtime: "java17"
 	env: "flex"
 
-	runtime_config:
-	  jdk: "openjdk8"
-
 	handlers:
 	- url: "/.*"
 	  script: "this field is required, but ignored"
@@ -405,7 +398,7 @@ You can deploy the app (for example, with a Maven plugin) by adding the project
 	<plugin>
 		<groupId>com.google.cloud.tools</groupId>
 		<artifactId>appengine-maven-plugin</artifactId>
-		<version>1.3.0</version>
+		<version>2.4.4</version>
 		<configuration>
 			<project>myproject</project>
 		</configuration>