From 676b0139989fb0db51969b7fee74ac9b08b4ea40 Mon Sep 17 00:00:00 2001 From: ifigotin Date: Mon, 7 May 2018 14:37:00 -0700 Subject: [PATCH 1/2] Clarify deployment of Spring Boot apps to App Engine Standard Closes gh-13090 --- .../src/main/asciidoc/deployment.adoc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc index e834ed8c62e..8bc686eff88 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc @@ -400,9 +400,11 @@ identifier for you and also sets up HTTP routes. Add a Java app to the project a it empty and then use the https://cloud.google.com/sdk/downloads[Google Cloud SDK] to push your Spring Boot app into that slot from the command line or CI build. -App Engine needs 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: +App Engine Standard requires one to use WAR packaging. Follow https://github.com/GoogleCloudPlatform/getting-started-java/blob/master/appengine-standard-java8/springboot-appengine-standard/README.md[these steps] to deploy App Engine Standard application to Google Cloud. + +App Engine Flex on the other hand 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: [source,yaml,indent=0] ---- @@ -446,10 +448,6 @@ build configuration, as shown in the following example: Then deploy with `mvn appengine:deploy` (if you need to authenticate first, the build fails). -NOTE: Google App Engine Classic is tied to the Servlet 2.5 API, so you cannot deploy a -Spring Application there without some modifications. See the -<> of this guide. - [[deployment-install]] From 7a53623e1ce4e9d4f54048f72c646cf1a46e7faa Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 8 May 2018 20:12:00 +0100 Subject: [PATCH 2/2] Polish "Clarify deployment of Spring Boot apps to App Engine Standard" See gh-13090 --- .../spring-boot-docs/src/main/asciidoc/deployment.adoc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc index 8bc686eff88..055505a945c 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc @@ -400,10 +400,12 @@ identifier for you and also sets up HTTP routes. Add a Java app to the project a it empty and then use the https://cloud.google.com/sdk/downloads[Google Cloud SDK] to push your Spring Boot app into that slot from the command line or CI build. -App Engine Standard requires one to use WAR packaging. Follow https://github.com/GoogleCloudPlatform/getting-started-java/blob/master/appengine-standard-java8/springboot-appengine-standard/README.md[these steps] to deploy App Engine Standard application to Google Cloud. +App Engine Standard requires you to use WAR packaging. Follow +https://github.com/GoogleCloudPlatform/getting-started-java/blob/master/appengine-standard-java8/springboot-appengine-standard/README.md[these steps] +to deploy App Engine Standard application to Google Cloud. -App Engine Flex on the other hand requires you to create an `app.yaml` file to describe -the resources your app requires. Normally, you put this file in `src/main/appengine`, +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: [source,yaml,indent=0]