From 362efd5ce8ea5a5a3c1dbbaf715830b8525085e0 Mon Sep 17 00:00:00 2001
From: Ludovic Champenois <ludo@google.com>
Date: Fri, 27 Jan 2017 14:08:12 -0800
Subject: [PATCH 1/4] Preparing GAE Java8 Standard doc samples.

---
 java8-appengine/analytics/pom.xml             | 20 +++++++++----
 .../appengine/analytics/AnalyticsServlet.java |  2 ++
 .../src/main/webapp/WEB-INF/appengine-web.xml |  1 +
 .../analytics/src/main/webapp/WEB-INF/web.xml | 29 -------------------
 java8-appengine/appidentity/pom.xml           | 18 ++++++++----
 java8-appengine/channel/pom.xml               | 14 +++++++--
 java8-appengine/cloudsql/pom.xml              | 10 +++----
 .../src/main/webapp/WEB-INF/appengine-web.xml |  1 +
 .../src/main/webapp/WEB-INF/appengine-web.xml |  1 +
 .../src/main/webapp/WEB-INF/appengine-web.xml |  1 +
 java8-appengine/datastore/pom.xml             |  6 ++--
 .../src/main/webapp/WEB-INF/appengine-web.xml |  1 +
 java8-appengine/firebase-tictactoe/pom.xml    |  6 ++--
 .../guestbook-cloud-datastore/pom.xml         |  8 ++---
 .../java/com/example/guestbook/TestUtils.java |  6 ++--
 java8-appengine/guestbook-objectify/pom.xml   |  6 ++--
 .../helloworld-new-plugins/pom.xml            | 12 ++++----
 java8-appengine/helloworld/pom.xml            | 10 +++----
 .../src/main/webapp/WEB-INF/appengine-web.xml |  1 +
 java8-appengine/images/pom.xml                | 10 +++----
 java8-appengine/logs/pom.xml                  | 10 +++----
 java8-appengine/mail/pom.xml                  |  9 +++---
 .../src/main/webapp/WEB-INF/appengine-web.xml |  1 +
 java8-appengine/mailgun/pom.xml               | 10 +++++--
 .../src/main/webapp/WEB-INF/appengine-web.xml |  1 +
 java8-appengine/mailjet/pom.xml               |  6 ++--
 .../src/main/webapp/WEB-INF/appengine-web.xml |  1 +
 java8-appengine/memcache/pom.xml              | 10 +++----
 .../src/main/webapp/WEB-INF/appengine-web.xml |  1 +
 java8-appengine/multitenancy/pom.xml          |  6 ++--
 java8-appengine/oauth2/pom.xml                |  6 ++--
 .../src/main/webapp/WEB-INF/appengine-web.xml |  1 +
 java8-appengine/requests/pom.xml              |  6 ++--
 .../src/main/webapp/WEB-INF/appengine-web.xml |  1 +
 java8-appengine/search/pom.xml                | 10 +++----
 .../src/main/webapp/WEB-INF/appengine-web.xml |  1 +
 java8-appengine/sendgrid/pom.xml              | 10 +++----
 .../src/main/webapp/WEB-INF/appengine-web.xml |  1 +
 java8-appengine/static-files/pom.xml          |  6 ++--
 .../src/main/webapp/WEB-INF/appengine-web.xml |  1 +
 java8-appengine/taskqueue-push/pom.xml        |  6 ++--
 .../src/main/webapp/WEB-INF/appengine-web.xml |  1 +
 java8-appengine/twilio/pom.xml                | 10 +++----
 .../src/main/webapp/WEB-INF/appengine-web.xml |  1 +
 java8-appengine/urlfetch/pom.xml              | 10 +++----
 .../src/main/webapp/WEB-INF/appengine-web.xml |  1 +
 java8-appengine/users/pom.xml                 | 10 +++----
 .../src/main/webapp/WEB-INF/appengine-web.xml |  1 +
 48 files changed, 162 insertions(+), 139 deletions(-)
 delete mode 100644 java8-appengine/analytics/src/main/webapp/WEB-INF/web.xml

diff --git a/java8-appengine/analytics/pom.xml b/java8-appengine/analytics/pom.xml
index 0280111e86c..db80830b76c 100644
--- a/java8-appengine/analytics/pom.xml
+++ b/java8-appengine/analytics/pom.xml
@@ -18,7 +18,7 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-analytics</artifactId>
+  <artifactId>appengine-analytics-java8</artifactId>
 
   <parent>
     <artifactId>doc-samples</artifactId>
@@ -29,8 +29,8 @@
   <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
 
   <properties>
-    <maven.compiler.target>1.7</maven.compiler.target>
-    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
   </properties>
 
   <dependencies>
@@ -45,8 +45,8 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
@@ -59,7 +59,15 @@
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>${appengine.sdk.version}</version>
+        <version>1.9.49-SNAPSHOT</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.6</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/java8-appengine/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java b/java8-appengine/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java
index ee8f5a678c4..6477963118d 100644
--- a/java8-appengine/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java
+++ b/java8-appengine/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java
@@ -27,12 +27,14 @@
 import java.net.URL;
 
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 // [START example]
 @SuppressWarnings("serial")
+@WebServlet(name = "analytics", urlPatterns = {"/"})
 public class AnalyticsServlet extends HttpServlet {
 
   @Override
diff --git a/java8-appengine/analytics/src/main/webapp/WEB-INF/appengine-web.xml b/java8-appengine/analytics/src/main/webapp/WEB-INF/appengine-web.xml
index efa1efaa42f..69071374535 100644
--- a/java8-appengine/analytics/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/java8-appengine/analytics/src/main/webapp/WEB-INF/appengine-web.xml
@@ -16,6 +16,7 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>YOUR-PROJECT-ID</application>
   <version>YOUR-VERSION-ID</version>
+  <runtime>java8</runtime>
   <threadsafe>true</threadsafe>
   <env-variables>
     <env-var name="GA_TRACKING_ID" value="YOUR-GA-TRACKING-ID" />
diff --git a/java8-appengine/analytics/src/main/webapp/WEB-INF/web.xml b/java8-appengine/analytics/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 1565774bf96..00000000000
--- a/java8-appengine/analytics/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- [START_EXCLUDE] -->
-<!--
-  Copyright 2015 Google Inc. All Rights Reserved.
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-        http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- [END_EXCLUDE] -->
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"
-  xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-  version="2.5">
-  <servlet>
-    <servlet-name>analytics</servlet-name>
-    <servlet-class>com.example.appengine.analytics.AnalyticsServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>analytics</servlet-name>
-    <url-pattern>/</url-pattern>
-  </servlet-mapping>
-</web-app>
-
diff --git a/java8-appengine/appidentity/pom.xml b/java8-appengine/appidentity/pom.xml
index 22c94aa7fb3..57119dd4a14 100644
--- a/java8-appengine/appidentity/pom.xml
+++ b/java8-appengine/appidentity/pom.xml
@@ -18,7 +18,7 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-appidentity</artifactId>
+  <artifactId>appengine-appidentity-java8</artifactId>
 
   <parent>
     <groupId>com.google.cloud</groupId>
@@ -44,8 +44,8 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
@@ -99,8 +99,16 @@
     <plugins>
       <plugin>
         <groupId>com.google.appengine</groupId>
-        <artifactId>gcloud-maven-plugin</artifactId>
-        <version>${gcloud-maven-plugin-version}</version>
+        <artifactId>appengine-maven-plugin</artifactId>
+        <version>${appengine.sdk.version}</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.6</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/java8-appengine/channel/pom.xml b/java8-appengine/channel/pom.xml
index 57d0543bcba..c1b42a4099b 100644
--- a/java8-appengine/channel/pom.xml
+++ b/java8-appengine/channel/pom.xml
@@ -18,7 +18,7 @@
     <packaging>war</packaging>
     <version>1.0-SNAPSHOT</version>
     <groupId>com.example.appengine</groupId>
-    <artifactId>appengine-channel</artifactId>
+    <artifactId>appengine-channel-java8</artifactId>
     <parent>
         <groupId>com.google.cloud</groupId>
         <artifactId>doc-samples</artifactId>
@@ -41,8 +41,8 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
@@ -106,6 +106,14 @@
                 <artifactId>appengine-maven-plugin</artifactId>
                 <version>${appengine.sdk.version}</version>
             </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-war-plugin</artifactId>
+              <version>2.6</version>
+              <configuration>
+                <failOnMissingWebXml>false</failOnMissingWebXml>
+              </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/java8-appengine/cloudsql/pom.xml b/java8-appengine/cloudsql/pom.xml
index 39aa14b3b6f..0f9aca004df 100644
--- a/java8-appengine/cloudsql/pom.xml
+++ b/java8-appengine/cloudsql/pom.xml
@@ -18,7 +18,7 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-cloudsql</artifactId>
+  <artifactId>appengine-cloudsql-java8</artifactId>
 
   <parent>
     <artifactId>doc-samples</artifactId>
@@ -41,16 +41,16 @@
 
 <!-- [START_EXCLUDE] -->
     <appengine.maven.plugin>1.0.0</appengine.maven.plugin>
-    <maven.compiler.target>1.7</maven.compiler.target>
-    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
 <!-- [END_EXCLUDE] -->
   </properties>
 <!-- [END properties] -->
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/java8-appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/appengine-web.xml b/java8-appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/appengine-web.xml
index e9d8b21cb8f..3597180a554 100644
--- a/java8-appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/java8-appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/appengine-web.xml
@@ -17,5 +17,6 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>YOUR-PROJECT-ID</application>
   <version>YOUR-VERSION-ID</version>
+  <runtime>java8</runtime>
   <threadsafe>true</threadsafe>
 </appengine-web-app>
diff --git a/java8-appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/appengine-web.xml b/java8-appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/appengine-web.xml
index e9d8b21cb8f..3597180a554 100644
--- a/java8-appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/java8-appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/appengine-web.xml
@@ -17,5 +17,6 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>YOUR-PROJECT-ID</application>
   <version>YOUR-VERSION-ID</version>
+  <runtime>java8</runtime>
   <threadsafe>true</threadsafe>
 </appengine-web-app>
diff --git a/java8-appengine/datastore/indexes/src/main/webapp/WEB-INF/appengine-web.xml b/java8-appengine/datastore/indexes/src/main/webapp/WEB-INF/appengine-web.xml
index e9d8b21cb8f..3597180a554 100644
--- a/java8-appengine/datastore/indexes/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/java8-appengine/datastore/indexes/src/main/webapp/WEB-INF/appengine-web.xml
@@ -17,5 +17,6 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>YOUR-PROJECT-ID</application>
   <version>YOUR-VERSION-ID</version>
+  <runtime>java8</runtime>
   <threadsafe>true</threadsafe>
 </appengine-web-app>
diff --git a/java8-appengine/datastore/pom.xml b/java8-appengine/datastore/pom.xml
index 99f450c035e..60c99050a1e 100644
--- a/java8-appengine/datastore/pom.xml
+++ b/java8-appengine/datastore/pom.xml
@@ -18,7 +18,7 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-datastore</artifactId>
+  <artifactId>appengine-datastore-java8</artifactId>
 
   <parent>
     <groupId>com.google.cloud</groupId>
@@ -36,8 +36,8 @@
 
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/java8-appengine/datastore/src/main/webapp/WEB-INF/appengine-web.xml b/java8-appengine/datastore/src/main/webapp/WEB-INF/appengine-web.xml
index c322e7d016e..59deeca833e 100644
--- a/java8-appengine/datastore/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/java8-appengine/datastore/src/main/webapp/WEB-INF/appengine-web.xml
@@ -16,5 +16,6 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>YOUR-PROJECT-ID</application>
   <version>YOUR-VERSION-ID</version>
+  <runtime>java8</runtime>
   <threadsafe>true</threadsafe>
 </appengine-web-app>
diff --git a/java8-appengine/firebase-tictactoe/pom.xml b/java8-appengine/firebase-tictactoe/pom.xml
index 866713c1479..b46dfb7b3b8 100644
--- a/java8-appengine/firebase-tictactoe/pom.xml
+++ b/java8-appengine/firebase-tictactoe/pom.xml
@@ -18,7 +18,7 @@
     <packaging>war</packaging>
     <version>1.0-SNAPSHOT</version>
     <groupId>com.example.appengine</groupId>
-    <artifactId>appengine-firebase-tictactoe</artifactId>
+    <artifactId>appengine-firebase-tictactoe-java8</artifactId>
     <parent>
         <groupId>com.google.cloud</groupId>
         <artifactId>doc-samples</artifactId>
@@ -49,8 +49,8 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>${servlet-api.version}</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
diff --git a/java8-appengine/guestbook-cloud-datastore/pom.xml b/java8-appengine/guestbook-cloud-datastore/pom.xml
index bc7683efe06..8ec3b923ea7 100644
--- a/java8-appengine/guestbook-cloud-datastore/pom.xml
+++ b/java8-appengine/guestbook-cloud-datastore/pom.xml
@@ -8,7 +8,7 @@
   <version>1.0-SNAPSHOT</version>
 
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-guestbook-cloud-datastore</artifactId>
+  <artifactId>appengine-guestbook-cloud-datastore-java8</artifactId>
   <properties>
     <guava.version>19.0</guava.version>
   </properties>
@@ -34,8 +34,8 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud</artifactId>
-      <version>0.4.0</version>
+      <version>0.8.0</version>
     </dependency>
 
     <dependency>
diff --git a/java8-appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/TestUtils.java b/java8-appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/TestUtils.java
index 3780f0266f2..080adeb5d41 100644
--- a/java8-appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/TestUtils.java
+++ b/java8-appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/TestUtils.java
@@ -8,9 +8,11 @@
 import com.google.cloud.datastore.QueryResults;
 import com.google.cloud.datastore.testing.LocalDatastoreHelper;
 import com.google.common.collect.Lists;
+import org.joda.time.Duration;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.concurrent.TimeoutException;
 
 public class TestUtils {
   static LocalDatastoreHelper datastore = LocalDatastoreHelper.create();
@@ -26,9 +28,9 @@ public static void startDatastore() {
 
   public static void stopDatastore() {
     try {
-      datastore.stop();
+      datastore.stop(Duration.millis(10000));
       Persistence.setDatastore(null);
-    } catch (IOException | InterruptedException e) {
+    } catch (IOException | InterruptedException | TimeoutException e) {
       throw new RuntimeException(e);
     }
   }
diff --git a/java8-appengine/guestbook-objectify/pom.xml b/java8-appengine/guestbook-objectify/pom.xml
index b59d7e9919b..cc73ae42f6a 100644
--- a/java8-appengine/guestbook-objectify/pom.xml
+++ b/java8-appengine/guestbook-objectify/pom.xml
@@ -6,7 +6,7 @@
     <version>1.0-SNAPSHOT</version>
 
     <groupId>com.example.appengine</groupId>
-    <artifactId>appengine-guestbook-objectify</artifactId>
+    <artifactId>appengine-guestbook-objectify-java8</artifactId>
     <properties>
         <objectify.version>5.1.14</objectify.version>
         <guava.version>20.0</guava.version>
@@ -33,8 +33,8 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/java8-appengine/helloworld-new-plugins/pom.xml b/java8-appengine/helloworld-new-plugins/pom.xml
index 889ad91cf04..8196dc50144 100644
--- a/java8-appengine/helloworld-new-plugins/pom.xml
+++ b/java8-appengine/helloworld-new-plugins/pom.xml
@@ -19,12 +19,12 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-helloworld-newplugins</artifactId>
+  <artifactId>appengine-helloworld-java8-newplugins</artifactId>
 
 <!-- [START compiler] -->
-  <properties>  <!-- App Engine Standard currently requires Java 7 -->
-    <maven.compiler.target>1.7</maven.compiler.target>
-    <maven.compiler.source>1.7</maven.compiler.source>
+  <properties> 
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
   </properties>
 <!-- [END compiler] -->
 
@@ -38,8 +38,8 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
diff --git a/java8-appengine/helloworld/pom.xml b/java8-appengine/helloworld/pom.xml
index 55155e62efd..c8e0827bcc6 100644
--- a/java8-appengine/helloworld/pom.xml
+++ b/java8-appengine/helloworld/pom.xml
@@ -19,7 +19,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-helloworld</artifactId>
+  <artifactId>appengine-helloworld-java8</artifactId>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>doc-samples</artifactId>
@@ -29,8 +29,8 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -43,8 +43,8 @@ Copyright 2015 Google Inc. All Rights Reserved.
         <version>3.3</version>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
       <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
diff --git a/java8-appengine/helloworld/src/main/webapp/WEB-INF/appengine-web.xml b/java8-appengine/helloworld/src/main/webapp/WEB-INF/appengine-web.xml
index 468b6d0430a..7c2aadab964 100644
--- a/java8-appengine/helloworld/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/java8-appengine/helloworld/src/main/webapp/WEB-INF/appengine-web.xml
@@ -15,6 +15,7 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>YOUR-PROJECT-ID</application>
   <version>YOUR-VERSION-ID</version>
+  <runtime>java8</runtime>
   <threadsafe>true</threadsafe>
 </appengine-web-app>
 <!-- [END config] -->
diff --git a/java8-appengine/images/pom.xml b/java8-appengine/images/pom.xml
index f52f8161b00..b3e282eeb35 100644
--- a/java8-appengine/images/pom.xml
+++ b/java8-appengine/images/pom.xml
@@ -18,7 +18,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-images</artifactId>
+  <artifactId>appengine-images-java8</artifactId>
 
   <properties>
       <appengine.sdk.version>1.9.48</appengine.sdk.version>
@@ -44,8 +44,8 @@ Copyright 2015 Google Inc. All Rights Reserved.
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -58,8 +58,8 @@ Copyright 2015 Google Inc. All Rights Reserved.
         <version>3.3</version>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
       <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
diff --git a/java8-appengine/logs/pom.xml b/java8-appengine/logs/pom.xml
index df77d0e2e15..f52c78305e8 100644
--- a/java8-appengine/logs/pom.xml
+++ b/java8-appengine/logs/pom.xml
@@ -19,7 +19,7 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-logs</artifactId>
+  <artifactId>appengine-logs-java8</artifactId>
   <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
   <parent>
     <groupId>com.google.cloud</groupId>
@@ -40,8 +40,8 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
@@ -65,8 +65,8 @@
         <version>3.3</version>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
       <plugin>
diff --git a/java8-appengine/mail/pom.xml b/java8-appengine/mail/pom.xml
index 19318a04121..8870c633399 100644
--- a/java8-appengine/mail/pom.xml
+++ b/java8-appengine/mail/pom.xml
@@ -18,7 +18,7 @@ Copyright 2016 Google Inc. All Rights Reserved.
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-mail</artifactId>
+  <artifactId>appengine-mail-java8</artifactId>
 
   <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
   <parent>
@@ -31,7 +31,8 @@ Copyright 2016 Google Inc. All Rights Reserved.
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
@@ -54,8 +55,8 @@ Copyright 2016 Google Inc. All Rights Reserved.
         <version>3.3</version>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
       <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
diff --git a/java8-appengine/mail/src/main/webapp/WEB-INF/appengine-web.xml b/java8-appengine/mail/src/main/webapp/WEB-INF/appengine-web.xml
index 176888c9b7d..c2f69f4b560 100644
--- a/java8-appengine/mail/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/java8-appengine/mail/src/main/webapp/WEB-INF/appengine-web.xml
@@ -16,6 +16,7 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>YOUR-PROJECT-ID</application>
   <version>YOUR-VERSION-ID</version>
+  <runtime>java8</runtime>
   <threadsafe>true</threadsafe>
 
   <!-- [START handle_incoming_mail] -->
diff --git a/java8-appengine/mailgun/pom.xml b/java8-appengine/mailgun/pom.xml
index 4e34256aad4..7f8ade0e4a5 100644
--- a/java8-appengine/mailgun/pom.xml
+++ b/java8-appengine/mailgun/pom.xml
@@ -18,7 +18,7 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-mailgun</artifactId>
+  <artifactId>appengine-mailgun-java8</artifactId>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>doc-samples</artifactId>
@@ -28,8 +28,8 @@
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
@@ -59,6 +59,10 @@
         <groupId>com.google.appengine</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
         <version>${appengine.sdk.version}</version>
+        <configuration>
+          <appId>a</appId>
+          <version>aa</version>
+        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/java8-appengine/mailgun/src/main/webapp/WEB-INF/appengine-web.xml b/java8-appengine/mailgun/src/main/webapp/WEB-INF/appengine-web.xml
index f720d147b74..be66e37f057 100644
--- a/java8-appengine/mailgun/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/java8-appengine/mailgun/src/main/webapp/WEB-INF/appengine-web.xml
@@ -16,6 +16,7 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>YOUR-PROJECT-ID</application>
   <version>YOUR-VERSION-ID</version>
+  <runtime>java8</runtime>
   <threadsafe>true</threadsafe>
   <env-variables>
     <env-var name="MAILGUN_DOMAIN_NAME" value="YOUR-MAILGUN-DOMAIN-NAME" />
diff --git a/java8-appengine/mailjet/pom.xml b/java8-appengine/mailjet/pom.xml
index 59f9cdb92f1..1df9d7e2ed0 100644
--- a/java8-appengine/mailjet/pom.xml
+++ b/java8-appengine/mailjet/pom.xml
@@ -18,7 +18,7 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-mailjet</artifactId>
+  <artifactId>appengine-mailjet-java8</artifactId>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>doc-samples</artifactId>
@@ -36,8 +36,8 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
diff --git a/java8-appengine/mailjet/src/main/webapp/WEB-INF/appengine-web.xml b/java8-appengine/mailjet/src/main/webapp/WEB-INF/appengine-web.xml
index 653950db1c9..3b8ba985e4d 100644
--- a/java8-appengine/mailjet/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/java8-appengine/mailjet/src/main/webapp/WEB-INF/appengine-web.xml
@@ -16,6 +16,7 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>YOUR-PROJECT-ID</application>
   <version>YOUR-VERSION-ID</version>
+  <runtime>java8</runtime>
   <threadsafe>true</threadsafe>
 // [START env_variables]
   <env-variables>
diff --git a/java8-appengine/memcache/pom.xml b/java8-appengine/memcache/pom.xml
index 0eeb3f52eb6..694bb6b158b 100644
--- a/java8-appengine/memcache/pom.xml
+++ b/java8-appengine/memcache/pom.xml
@@ -18,7 +18,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-memcache</artifactId>
+  <artifactId>appengine-memcache-java8</artifactId>
 
   <parent>
     <artifactId>doc-samples</artifactId>
@@ -30,8 +30,8 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
@@ -64,8 +64,8 @@ Copyright 2015 Google Inc. All Rights Reserved.
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.3</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
     </plugins>
diff --git a/java8-appengine/memcache/src/main/webapp/WEB-INF/appengine-web.xml b/java8-appengine/memcache/src/main/webapp/WEB-INF/appengine-web.xml
index 089c609c550..128c0415ed5 100644
--- a/java8-appengine/memcache/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/java8-appengine/memcache/src/main/webapp/WEB-INF/appengine-web.xml
@@ -16,6 +16,7 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>YOUR-PROJECT-ID</application>
   <version>YOUR-VERSION-ID</version>
+  <runtime>java8</runtime>
   <threadsafe>true</threadsafe>
 </appengine-web-app>
 
diff --git a/java8-appengine/multitenancy/pom.xml b/java8-appengine/multitenancy/pom.xml
index a1b7cc67d86..c800d9b66fd 100644
--- a/java8-appengine/multitenancy/pom.xml
+++ b/java8-appengine/multitenancy/pom.xml
@@ -6,7 +6,7 @@
     <version>1.0-SNAPSHOT</version>
 
     <groupId>com.example.appengine</groupId>
-    <artifactId>appengine-multitenancy</artifactId>
+    <artifactId>appengine-multitenancy-java8</artifactId>
 
     <properties>
         <objectify.version>5.1.14</objectify.version>
@@ -34,8 +34,8 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/java8-appengine/oauth2/pom.xml b/java8-appengine/oauth2/pom.xml
index 4382d2b0273..6e7b37c75ca 100644
--- a/java8-appengine/oauth2/pom.xml
+++ b/java8-appengine/oauth2/pom.xml
@@ -18,7 +18,7 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-oauth2</artifactId>
+  <artifactId>appengine-oauth2-java8</artifactId>
 
   <parent>
     <groupId>com.google.cloud</groupId>
@@ -36,8 +36,8 @@
 
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/java8-appengine/oauth2/src/main/webapp/WEB-INF/appengine-web.xml b/java8-appengine/oauth2/src/main/webapp/WEB-INF/appengine-web.xml
index c322e7d016e..59deeca833e 100644
--- a/java8-appengine/oauth2/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/java8-appengine/oauth2/src/main/webapp/WEB-INF/appengine-web.xml
@@ -16,5 +16,6 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>YOUR-PROJECT-ID</application>
   <version>YOUR-VERSION-ID</version>
+  <runtime>java8</runtime>
   <threadsafe>true</threadsafe>
 </appengine-web-app>
diff --git a/java8-appengine/requests/pom.xml b/java8-appengine/requests/pom.xml
index 347f5e3c148..78325a85e6c 100644
--- a/java8-appengine/requests/pom.xml
+++ b/java8-appengine/requests/pom.xml
@@ -19,7 +19,7 @@ Copyright 2016 Google Inc. All Rights Reserved.
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-requests</artifactId>
+  <artifactId>appengine-requests-java8</artifactId>
   <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
   <parent>
     <groupId>com.google.cloud</groupId>
@@ -40,8 +40,8 @@ Copyright 2016 Google Inc. All Rights Reserved.
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
diff --git a/java8-appengine/requests/src/main/webapp/WEB-INF/appengine-web.xml b/java8-appengine/requests/src/main/webapp/WEB-INF/appengine-web.xml
index c9e245399bf..cb3b69805fc 100644
--- a/java8-appengine/requests/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/java8-appengine/requests/src/main/webapp/WEB-INF/appengine-web.xml
@@ -2,5 +2,6 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>YOUR-PROJECT-ID</application>
   <version>YOUR-VERSION-ID</version>
+  <runtime>java8</runtime>
   <threadsafe>true</threadsafe>
 </appengine-web-app>
diff --git a/java8-appengine/search/pom.xml b/java8-appengine/search/pom.xml
index c990803ab9f..0b5e64d73c2 100644
--- a/java8-appengine/search/pom.xml
+++ b/java8-appengine/search/pom.xml
@@ -18,7 +18,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-search</artifactId>
+  <artifactId>appengine-search-java8</artifactId>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>doc-samples</artifactId>
@@ -33,8 +33,8 @@ Copyright 2015 Google Inc. All Rights Reserved.
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
@@ -86,8 +86,8 @@ Copyright 2015 Google Inc. All Rights Reserved.
         <version>3.3</version>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
       <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
diff --git a/java8-appengine/search/src/main/webapp/WEB-INF/appengine-web.xml b/java8-appengine/search/src/main/webapp/WEB-INF/appengine-web.xml
index c322e7d016e..59deeca833e 100644
--- a/java8-appengine/search/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/java8-appengine/search/src/main/webapp/WEB-INF/appengine-web.xml
@@ -16,5 +16,6 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>YOUR-PROJECT-ID</application>
   <version>YOUR-VERSION-ID</version>
+  <runtime>java8</runtime>
   <threadsafe>true</threadsafe>
 </appengine-web-app>
diff --git a/java8-appengine/sendgrid/pom.xml b/java8-appengine/sendgrid/pom.xml
index 4e8f7e34c26..3585b4b54c9 100644
--- a/java8-appengine/sendgrid/pom.xml
+++ b/java8-appengine/sendgrid/pom.xml
@@ -18,7 +18,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-sendgrid</artifactId>
+  <artifactId>appengine-sendgrid-java8</artifactId>
 
   <parent>
     <artifactId>doc-samples</artifactId>
@@ -30,8 +30,8 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
@@ -58,8 +58,8 @@ Copyright 2015 Google Inc. All Rights Reserved.
         <version>3.3</version>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
     </plugins>
diff --git a/java8-appengine/sendgrid/src/main/webapp/WEB-INF/appengine-web.xml b/java8-appengine/sendgrid/src/main/webapp/WEB-INF/appengine-web.xml
index 1e2b8457676..80869fa4b94 100644
--- a/java8-appengine/sendgrid/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/java8-appengine/sendgrid/src/main/webapp/WEB-INF/appengine-web.xml
@@ -16,6 +16,7 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>YOUR-PROJECT-ID</application>
   <version>YOUR-VERSION-ID</version>
+  <runtime>java8</runtime>
   <threadsafe>true</threadsafe>
   <env-variables>
     <env-var name="SENDGRID_API_KEY" value="YOUR-SENDGRID-API-KEY" />
diff --git a/java8-appengine/static-files/pom.xml b/java8-appengine/static-files/pom.xml
index a3eaf7d2f8f..966f788c018 100644
--- a/java8-appengine/static-files/pom.xml
+++ b/java8-appengine/static-files/pom.xml
@@ -18,7 +18,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-staticfiles</artifactId>
+  <artifactId>appengine-staticfiles-java8</artifactId>
 
   <parent>
     <artifactId>doc-samples</artifactId>
@@ -51,8 +51,8 @@ Copyright 2015 Google Inc. All Rights Reserved.
         <version>3.3</version>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
     </plugins>
diff --git a/java8-appengine/static-files/src/main/webapp/WEB-INF/appengine-web.xml b/java8-appengine/static-files/src/main/webapp/WEB-INF/appengine-web.xml
index ad825e10799..d7de03eb5f7 100644
--- a/java8-appengine/static-files/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/java8-appengine/static-files/src/main/webapp/WEB-INF/appengine-web.xml
@@ -16,6 +16,7 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>YOUR-PROJECT-ID</application>
   <version>YOUR-VERSION-ID</version>
+  <runtime>java8</runtime>
   <threadsafe>true</threadsafe>
 </appengine-web-app>
 
diff --git a/java8-appengine/taskqueue-push/pom.xml b/java8-appengine/taskqueue-push/pom.xml
index f904872a241..3811d0f697d 100644
--- a/java8-appengine/taskqueue-push/pom.xml
+++ b/java8-appengine/taskqueue-push/pom.xml
@@ -19,7 +19,7 @@ Copyright 2016 Google Inc. All Rights Reserved.
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>taskqueue-push</artifactId>
+  <artifactId>taskqueue-push-java8</artifactId>
   <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
   <parent>
     <groupId>com.google.cloud</groupId>
@@ -30,8 +30,8 @@ Copyright 2016 Google Inc. All Rights Reserved.
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
diff --git a/java8-appengine/taskqueue-push/src/main/webapp/WEB-INF/appengine-web.xml b/java8-appengine/taskqueue-push/src/main/webapp/WEB-INF/appengine-web.xml
index 878132f8813..e1004618cbb 100644
--- a/java8-appengine/taskqueue-push/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/java8-appengine/taskqueue-push/src/main/webapp/WEB-INF/appengine-web.xml
@@ -17,5 +17,6 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>YOUR-PROJECT-ID</application>
   <version>YOUR-VERSION-ID</version>
+  <runtime>java8</runtime>
   <threadsafe>true</threadsafe>
 </appengine-web-app>
diff --git a/java8-appengine/twilio/pom.xml b/java8-appengine/twilio/pom.xml
index 7db6abaab1e..3103c8cbb34 100644
--- a/java8-appengine/twilio/pom.xml
+++ b/java8-appengine/twilio/pom.xml
@@ -18,7 +18,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-twilio</artifactId>
+  <artifactId>appengine-twilio-java8</artifactId>
 
   <parent>
     <artifactId>doc-samples</artifactId>
@@ -37,8 +37,8 @@ Copyright 2015 Google Inc. All Rights Reserved.
     <!-- [END dependencies] -->
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
@@ -58,8 +58,8 @@ Copyright 2015 Google Inc. All Rights Reserved.
         <version>3.3</version>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
     </plugins>
diff --git a/java8-appengine/twilio/src/main/webapp/WEB-INF/appengine-web.xml b/java8-appengine/twilio/src/main/webapp/WEB-INF/appengine-web.xml
index 34cd5e0b3ad..e2dc44326ab 100644
--- a/java8-appengine/twilio/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/java8-appengine/twilio/src/main/webapp/WEB-INF/appengine-web.xml
@@ -15,6 +15,7 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>YOUR-PROJECT-ID</application>
   <version>YOUR-VERSION-ID</version>
+  <runtime>java8</runtime>
   <threadsafe>true</threadsafe>
   <env-variables>
     <env-var name="TWILIO_ACCOUNT_SID" value="YOUR-TWILIO-ACCOUNT-SID" />
diff --git a/java8-appengine/urlfetch/pom.xml b/java8-appengine/urlfetch/pom.xml
index 2acd297343b..937a687d7f6 100644
--- a/java8-appengine/urlfetch/pom.xml
+++ b/java8-appengine/urlfetch/pom.xml
@@ -18,7 +18,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-URLFetch</artifactId>
+  <artifactId>appengine-URLFetch-java8</artifactId>
 
   <parent>
     <groupId>com.google.cloud</groupId>
@@ -30,8 +30,8 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -50,8 +50,8 @@ Copyright 2015 Google Inc. All Rights Reserved.
         <version>3.3</version>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
       <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
diff --git a/java8-appengine/urlfetch/src/main/webapp/WEB-INF/appengine-web.xml b/java8-appengine/urlfetch/src/main/webapp/WEB-INF/appengine-web.xml
index c9e245399bf..cb3b69805fc 100644
--- a/java8-appengine/urlfetch/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/java8-appengine/urlfetch/src/main/webapp/WEB-INF/appengine-web.xml
@@ -2,5 +2,6 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>YOUR-PROJECT-ID</application>
   <version>YOUR-VERSION-ID</version>
+  <runtime>java8</runtime>
   <threadsafe>true</threadsafe>
 </appengine-web-app>
diff --git a/java8-appengine/users/pom.xml b/java8-appengine/users/pom.xml
index 5ecc5616eba..eef99fcaf4d 100644
--- a/java8-appengine/users/pom.xml
+++ b/java8-appengine/users/pom.xml
@@ -20,7 +20,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-users</artifactId>
+  <artifactId>appengine-users-java8</artifactId>
   <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
   <parent>
     <groupId>com.google.cloud</groupId>
@@ -41,8 +41,8 @@ Copyright 2015 Google Inc. All Rights Reserved.
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
@@ -99,8 +99,8 @@ Copyright 2015 Google Inc. All Rights Reserved.
         <version>3.3</version>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
       <plugin>
diff --git a/java8-appengine/users/src/main/webapp/WEB-INF/appengine-web.xml b/java8-appengine/users/src/main/webapp/WEB-INF/appengine-web.xml
index c9e245399bf..cb3b69805fc 100644
--- a/java8-appengine/users/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/java8-appengine/users/src/main/webapp/WEB-INF/appengine-web.xml
@@ -2,5 +2,6 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>YOUR-PROJECT-ID</application>
   <version>YOUR-VERSION-ID</version>
+  <runtime>java8</runtime>
   <threadsafe>true</threadsafe>
 </appengine-web-app>

From 01347c40bc264bfbbbd8474506a9a999e0455efe Mon Sep 17 00:00:00 2001
From: Ludovic Champenois <ludo@google.com>
Date: Fri, 27 Jan 2017 14:24:41 -0800
Subject: [PATCH 2/4] Remove snapshot dependency, and fix formatting.

---
 java8-appengine/analytics/pom.xml           | 2 +-
 java8-appengine/guestbook-objectify/pom.xml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/java8-appengine/analytics/pom.xml b/java8-appengine/analytics/pom.xml
index db80830b76c..83544740b4b 100644
--- a/java8-appengine/analytics/pom.xml
+++ b/java8-appengine/analytics/pom.xml
@@ -59,7 +59,7 @@
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>1.9.49-SNAPSHOT</version>
+                <version>${appengine.sdk.version}</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/java8-appengine/guestbook-objectify/pom.xml b/java8-appengine/guestbook-objectify/pom.xml
index cc73ae42f6a..5635606935f 100644
--- a/java8-appengine/guestbook-objectify/pom.xml
+++ b/java8-appengine/guestbook-objectify/pom.xml
@@ -32,10 +32,10 @@
             <version>${appengine.sdk.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-            <scope>provided</scope>
+          <groupId>javax.servlet</groupId>
+          <artifactId>javax.servlet-api</artifactId>
+          <version>3.1.0</version>
+          <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jstl</groupId>

From cce4ea598a8fe55f878572dad1e6d130910316e5 Mon Sep 17 00:00:00 2001
From: Ludovic Champenois <ludo@google.com>
Date: Fri, 27 Jan 2017 14:25:52 -0800
Subject: [PATCH 3/4] Remove snapshot dependency, and fix formatting.

---
 java8-appengine/analytics/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java8-appengine/analytics/pom.xml b/java8-appengine/analytics/pom.xml
index 83544740b4b..7d96cd0c2a8 100644
--- a/java8-appengine/analytics/pom.xml
+++ b/java8-appengine/analytics/pom.xml
@@ -59,7 +59,7 @@
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-                <version>${appengine.sdk.version}</version>
+        <version>${appengine.sdk.version}</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

From 460cb7606a22bc1041b519c90c04ad01d499f3d6 Mon Sep 17 00:00:00 2001
From: Ludovic Champenois <ludo@google.com>
Date: Fri, 27 Jan 2017 16:25:00 -0800
Subject: [PATCH 4/4] Fix formatting.

---
 java8-appengine/channel/pom.xml      | 10 +++++-----
 java8-appengine/mailgun/pom.xml      |  4 ----
 java8-appengine/multitenancy/pom.xml |  8 ++++----
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/java8-appengine/channel/pom.xml b/java8-appengine/channel/pom.xml
index c1b42a4099b..6cb46df7762 100644
--- a/java8-appengine/channel/pom.xml
+++ b/java8-appengine/channel/pom.xml
@@ -40,11 +40,11 @@
             <version>${appengine.sdk.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-            <type>jar</type>
-            <scope>provided</scope>
+          <groupId>javax.servlet</groupId>
+          <artifactId>javax.servlet-api</artifactId>
+          <version>3.1.0</version>
+          <type>jar</type>
+          <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
diff --git a/java8-appengine/mailgun/pom.xml b/java8-appengine/mailgun/pom.xml
index 7f8ade0e4a5..1d29b0ee95e 100644
--- a/java8-appengine/mailgun/pom.xml
+++ b/java8-appengine/mailgun/pom.xml
@@ -59,10 +59,6 @@
         <groupId>com.google.appengine</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
         <version>${appengine.sdk.version}</version>
-        <configuration>
-          <appId>a</appId>
-          <version>aa</version>
-        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/java8-appengine/multitenancy/pom.xml b/java8-appengine/multitenancy/pom.xml
index c800d9b66fd..0a51d748942 100644
--- a/java8-appengine/multitenancy/pom.xml
+++ b/java8-appengine/multitenancy/pom.xml
@@ -33,10 +33,10 @@
             <version>${appengine.sdk.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-            <scope>provided</scope>
+          <groupId>javax.servlet</groupId>
+          <artifactId>javax.servlet-api</artifactId>
+          <version>3.1.0</version>
+          <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jstl</groupId>