Update Cloud SQL sample App Engine xml and README (GoogleCloudPlatform#7324)

jsimonweb · web-flow · commit 4b6617d4024d · 2022-10-06T10:18:59.000-07:00
diff --git a/cloud-sql/mysql/servlet/README.md b/cloud-sql/mysql/servlet/README.md
@@ -113,12 +113,12 @@ mvn function:run -Drun.functionTarget=com.example.cloudsql.functions.Main
 
 ### Deploy to Google App Engine
 
-First, update `src/main/webapp/WEB-INF/appengine-web.xml` with the correct values to pass the
-environment variables into the runtime.
+First, update [`src/main/webapp/WEB-INF/appengine-web.xml`](src/main/webapp/WEB-INF/appengine-web.xml)
+with the correct values to pass the environment variables into the runtime.
 
 Next, the following command will deploy the application to your Google Cloud project:
 ```bash
-mvn clean package appengine:deploy
+mvn clean package appengine:deploy -DskipTests
 ```
 
 ### Deploy to Cloud Run
diff --git a/cloud-sql/mysql/servlet/src/main/webapp/WEB-INF/appengine-web.xml b/cloud-sql/mysql/servlet/src/main/webapp/WEB-INF/appengine-web.xml
@@ -16,7 +16,7 @@
 -->
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <threadsafe>true</threadsafe>
-  <runtime>java8</runtime>
+  <runtime>java17</runtime>
   <env-variables>
     <env-var name="INSTANCE_CONNECTION_NAME" value="my-project:region:instance" />
     <env-var name="DB_USER" value="my-db-user" />
diff --git a/cloud-sql/postgres/servlet/README.md b/cloud-sql/postgres/servlet/README.md
@@ -103,12 +103,12 @@ mvn function:run -Drun.functionTarget=com.example.cloudsql.functions.Main
 
 ### Deploy to Google App Engine
 
-First, update `src/main/webapp/WEB-INF/appengine-web.xml` with the correct values to pass the 
-environment variables into the runtime.
+First, update [`src/main/webapp/WEB-INF/appengine-web.xml`](src/main/webapp/WEB-INF/appengine-web.xml)
+with the correct values to pass the environment variables into the runtime.
 
 Next, the following command will deploy the application to your Google Cloud project:
 ```bash
-mvn clean package appengine:deploy
+mvn clean package appengine:deploy -DskipTests
 ```
 
 ### Deploy to Cloud Run
diff --git a/cloud-sql/postgres/servlet/src/main/webapp/WEB-INF/appengine-web.xml b/cloud-sql/postgres/servlet/src/main/webapp/WEB-INF/appengine-web.xml
@@ -16,7 +16,7 @@
 -->
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <threadsafe>true</threadsafe>
-  <runtime>java8</runtime>
+  <runtime>java17</runtime>
   <env-variables>
     <env-var name="INSTANCE_CONNECTION_NAME" value="my-project:region:instance" />
     <env-var name="DB_USER" value="my-db-user" />
diff --git a/cloud-sql/sqlserver/servlet/README.md b/cloud-sql/sqlserver/servlet/README.md
@@ -93,14 +93,14 @@ To run the application locally as a Cloud Function, run the following command:
 mvn function:run -Drun.functionTarget=com.example.cloudsql.functions.Main
 ```
 
-### Deploy to Google Cloud
+### Deploy to Google App Engine
 
-First, update `src/main/webapp/WEB-INF/appengine-web.xml` with the correct values to pass the 
-environment variables into the runtime.
+First, update [`src/main/webapp/WEB-INF/appengine-web.xml`](src/main/webapp/WEB-INF/appengine-web.xml)
+with the correct values to pass the environment variables into the runtime.
 
 Next, the following command will deploy the application to your Google Cloud project:
 ```bash
-mvn clean package appengine:deploy
+mvn clean package appengine:deploy -DskipTests
 ```
 
 ### Deploy to Cloud Run
diff --git a/cloud-sql/sqlserver/servlet/src/main/webapp/WEB-INF/appengine-web.xml b/cloud-sql/sqlserver/servlet/src/main/webapp/WEB-INF/appengine-web.xml
@@ -16,7 +16,7 @@
 -->
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <threadsafe>true</threadsafe>
-  <runtime>java8</runtime>
+  <runtime>java17</runtime>
   <env-variables>
     <env-var name="INSTANCE_CONNECTION_NAME" value="project-name:region-name:instance-name" />
     <env-var name="DB_USER" value="my-db-user" />
