Update app.yaml for Java 11 (GoogleCloudPlatform#3007)

averikitsch · web-flow · commit 9b2ead75a56c · 2020-06-01T13:03:08.000-07:00
diff --git a/appengine-java11/appengine-simple-jetty-main/README.md b/appengine-java11/appengine-simple-jetty-main/README.md
@@ -58,7 +58,6 @@ To use the dependency add the entrypoint to your `app.yaml` file. The
 entrypoint field will start the Jetty server and load your `WAR` file.
 ```
 runtime: java11
-instance_class: F1
 entrypoint: 'java -cp "*" com.example.appengine.demo.jettymain.Main helloworld.war'
 ```
 
diff --git a/appengine-java11/cloudsql/app.yaml b/appengine-java11/cloudsql/app.yaml
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 runtime: java11
-instance_class: F1
 entrypoint: 'java -cp "*" com.example.appengine.demo.jettymain.Main cloudsql.war'
 
 env_variables:
diff --git a/appengine-java11/gaeinfo/src/main/appengine/app.yaml b/appengine-java11/gaeinfo/src/main/appengine/app.yaml
@@ -13,5 +13,4 @@
 # limitations under the License.
 
 runtime: java11
-instance_class: F1
 entrypoint: 'java -cp "*" com.example.appengine.demo.jettymain.Main gaeinfo.war'
diff --git a/appengine-java11/guestbook-cloud-firestore/src/main/appengine/app.yaml b/appengine-java11/guestbook-cloud-firestore/src/main/appengine/app.yaml
@@ -13,6 +13,5 @@
 
 # [START gae_java11_firestore_yaml]
 runtime: java11
-instance_class: F1
 entrypoint: 'java -cp "*" com.example.appengine.demo.jettymain.Main guestbook.war'
 # [END gae_java11_firestore_yaml]
diff --git a/appengine-java11/helloworld-servlet/README.md b/appengine-java11/helloworld-servlet/README.md
@@ -60,7 +60,6 @@ application settings:
 - The entrypoint field will start the Jetty server and load your `WAR` file.
 ```
 runtime: java11
-instance_class: F1
 entrypoint: 'java -cp "*" com.example.appengine.demo.jettymain.Main helloworld.war'
 ```
 
diff --git a/appengine-java11/helloworld-servlet/src/main/appengine/app.yaml b/appengine-java11/helloworld-servlet/src/main/appengine/app.yaml
@@ -13,6 +13,5 @@
 
 # [START gae_java11_servlet_yaml]
 runtime: java11
-instance_class: F1
 entrypoint: 'java -cp "*" com.example.appengine.demo.jettymain.Main helloworld.war'
 # [END gae_java11_servlet_yaml]
diff --git a/appengine-java11/kotlin-ktor/app.yaml b/appengine-java11/kotlin-ktor/app.yaml
@@ -13,5 +13,4 @@
 # limitations under the License.
 
 runtime: java11
-instance_class: F1
-entrypoint: 'java -Xmx32m -jar kotlin-ktor-0.0.1-jar-with-dependencies.jar'
+entrypoint: 'java -jar target/kotlin-ktor-0.0.1-jar-with-dependencies.jar'
diff --git a/appengine-java11/micronaut-helloworld/src/main/appengine/app.yaml b/appengine-java11/micronaut-helloworld/src/main/appengine/app.yaml
@@ -13,4 +13,3 @@
 # limitations under the License.
 
 runtime: java11
-instance_class: F1
diff --git a/appengine-java11/oauth2/src/main/appengine/app.yaml b/appengine-java11/oauth2/src/main/appengine/app.yaml
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 runtime: java11
-instance_class: F1
 entrypoint: 'java -cp "*" com.example.appengine.demo.jettymain.Main oauth2.war'
 
 # [START gae_java11_oauth2_yaml]
diff --git a/appengine-java11/quarkus-helloworld/src/main/appengine/app.yaml b/appengine-java11/quarkus-helloworld/src/main/appengine/app.yaml
@@ -13,4 +13,3 @@
 # limitations under the License.
 
 runtime: java11
-instance_class: F1
diff --git a/appengine-java11/spanner/src/main/appengine/app.yaml b/appengine-java11/spanner/src/main/appengine/app.yaml
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 runtime: java11
-instance_class: F1
 entrypoint: 'java -cp "*" com.example.appengine.demo.jettymain.Main spanner.war'
 
 env_variables:
diff --git a/appengine-java11/sparkjava-helloworld/src/main/appengine/app.yaml b/appengine-java11/sparkjava-helloworld/src/main/appengine/app.yaml
@@ -13,4 +13,3 @@
 # limitations under the License.
 
 runtime: java11
-instance_class: F1
diff --git a/appengine-java11/springboot-helloworld/src/main/appengine/app.yaml b/appengine-java11/springboot-helloworld/src/main/appengine/app.yaml
@@ -14,9 +14,4 @@
 
 # [START gae_java11_helloworld_yaml]
 runtime: java11
-instance_class: F1
-
-# Explicitly set the memory limit and maximum heap size for the Spring Boot app
-env_variables:
-  JAVA_TOOL_OPTIONS: "-XX:MaxRAM=256m -XX:ActiveProcessorCount=2 -Xmx32m"
 # [END gae_java11_helloworld_yaml]

Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,3 @@`
`13`	`13`	`# limitations under the License.`
`14`	`14`
`15`	`15`	`runtime: java11`
`16`		`-instance_class: F1`