Update Kokoro java versions (GoogleCloudPlatform#2059)

averikitsch · web-flow · commit f9267b753e0d · 2020-02-06T17:16:45.000-08:00
* Fix kokoro test versions

* trigger tests

* fix removal

* Fix error
diff --git a/.kokoro/java11/common.cfg b/.kokoro/java11/common.cfg
@@ -32,7 +32,7 @@ action {
 # Set the JAVA VERSION env var.
 env_vars: {
     key: "JAVA_VERSION"
-    value: "11"
+    value: "1.8,11"
 }
 
 # Configure the docker image for kokoro-trampoline.
diff --git a/.kokoro/java8/common.cfg b/.kokoro/java8/common.cfg
@@ -32,7 +32,7 @@ action {
 # Set the JAVA VERSION env var.
 env_vars: {
     key: "JAVA_VERSION"
-    value: "1.8, 11"
+    value: "1.8"
 }
 
 # Configure the docker image for kokoro-trampoline.
diff --git a/.kokoro/tests/run_tests.sh b/.kokoro/tests/run_tests.sh
@@ -75,7 +75,7 @@ if [[ "$SCRIPT_DEBUG" != "true" ]]; then
 fi
 
 # Package local jetty dependency for Java11 samples
-if [[ "$JAVA_VERSION" == "11" ]]; then
+if [[ ",$JAVA_VERSION," =~ "11" ]]; then
   cd appengine-java11/appengine-simple-jetty-main/
   mvn install --quiet
   cd ../../
diff --git a/appengine-java11/http-server/pom.xml b/appengine-java11/http-server/pom.xml
@@ -34,6 +34,7 @@
           </archive>
         </configuration>
       </plugin>
+      
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
diff --git a/appengine-java8/analytics/README.md b/appengine-java8/analytics/README.md
@@ -21,4 +21,4 @@ To run this sample locally:
 
 ## Deploying
 
-    $ mvn appengine:deploy
+    $ mvn clean package appengine:deploy -Dapp.deploy.projectId=<your-project-id>
diff --git a/appengine-java8/analytics/pom.xml b/appengine-java8/analytics/pom.xml
@@ -110,8 +110,9 @@
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>1.3.1</version>
+        <version>2.2.0</version>
         <configuration>
+          <version>analytics</version>
           <deploy.promote>true</deploy.promote>
           <deploy.stopPreviousVersion>true</deploy.stopPreviousVersion>
         </configuration>

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ action {`
`32`	`32`	`# Set the JAVA VERSION env var.`
`33`	`33`	`env_vars: {`
`34`	`34`	`key: "JAVA_VERSION"`
`35`		`- value: "11"`
	`35`	`+ value: "1.8,11"`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`# Configure the docker image for kokoro-trampoline.`
Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,4 @@ To run this sample locally:`
`21`	`21`
`22`	`22`	`## Deploying`
`23`	`23`
`24`		`- $ mvn appengine:deploy`
	`24`	`+ $ mvn clean package appengine:deploy -Dapp.deploy.projectId=<your-project-id>`