SyCode7
diff --git a/‎appengine/endpoints-frameworks-v2/migration-example/README.md
Lines changed: 8 additions & 15 deletions b/‎appengine/endpoints-frameworks-v2/migration-example/README.md
Lines changed: 8 additions & 15 deletions
diff --git a/‎appengine/endpoints-frameworks-v2/migration-example/build.gradle
Lines changed: 3 additions & 3 deletions b/‎appengine/endpoints-frameworks-v2/migration-example/build.gradle
Lines changed: 3 additions & 3 deletions
diff --git a/‎appengine/endpoints-frameworks-v2/migration-example/pom.xml
Lines changed: 5 additions & 12 deletions b/‎appengine/endpoints-frameworks-v2/migration-example/pom.xml
Lines changed: 5 additions & 12 deletions
diff --git a/‎appengine/endpoints-frameworks-v2/migration-example/src/main/java/com/example/helloendpoints/Constants.java
Lines changed: 1 addition & 0 deletions b/‎appengine/endpoints-frameworks-v2/migration-example/src/main/java/com/example/helloendpoints/Constants.java
Lines changed: 1 addition & 0 deletions
diff --git a/‎appengine/endpoints-frameworks-v2/migration-example/src/main/java/com/example/helloendpoints/Greetings.java
Lines changed: 2 additions & 1 deletion b/‎appengine/endpoints-frameworks-v2/migration-example/src/main/java/com/example/helloendpoints/Greetings.java
Lines changed: 2 additions & 1 deletion
diff --git a/‎appengine/endpoints-frameworks-v2/migration-example/src/main/webapp/WEB-INF/web.xml
Lines changed: 3 additions & 2 deletions b/‎appengine/endpoints-frameworks-v2/migration-example/src/main/webapp/WEB-INF/web.xml
Lines changed: 3 additions & 2 deletions
@@ -61,6 +61,8 @@ process is explained [here][8] and a quickstart is provided [here][9].
       client IDs registered in the
       [Credentials on Developers Console for OAuth 2.0 client IDs][6].
 
+    - Note: iOS support should work but has not been fully tested.
+
     - These client IDs are used when defining annotation for this sample API
       found in [Greetings.java](src/main/java/com/example/helloendpoints/Greetings.java).
 
@@ -83,13 +85,9 @@ process is explained [here][8] and a quickstart is provided [here][9].
 
 ###  Maven
 
-1. Build a fresh binary by using:
-
-    `mvn clean compile`
+1. Build and Run the application locally at [http://localhost:8080][5] by using:
 
-1. Run the application locally at [http://localhost:8080][5] by using:
-
-    `mvn appengine:run`
+    `mvn clean appengine:run`
 
 1. Explore local server's API explorer by browsing to:
 
@@ -105,19 +103,15 @@ process is explained [here][8] and a quickstart is provided [here][9].
 
     `mvn endpoints-framework:clientLibs`
 
-1. Deploy your application to Google App Engine by using:
+1. Build and Deploy your application to Google App Engine by using:
 
-    `mvn appengine:deploy`
+    `mvn clean appengine:deploy`
 
 ### Gradle
 
-1. Build a fresh binary by using:
+1. Build and Run the application locally at [http://localhost:8080][5] by using:
 
-    `gradle clean compileJava`
-
-1. Run the application locally at [http://localhost:8080][5] by using:
-
-    `gradle appengineRun`
+    `gradle clean appengineRun`
 
 1. Explore local server's API explorer by browsing to:
 
@@ -137,7 +131,6 @@ process is explained [here][8] and a quickstart is provided [here][9].
 
     `gradle appengineDeploy`
 
-
 [1]: https://cloud.google.com/appengine/docs/java/
 [2]: http://java.com/en/
 [3]: https://cloud.google.com/endpoints/docs/frameworks/legacy/v1/java
 
@@ -49,13 +49,13 @@ dependencies {
   compile 'jstl:jstl:1.2'
   compile group: 'javax.inject', name: 'javax.inject', version: '1'
 
-  // Uncomment to use Endpoints Frameworks v1.0
-  // compile group: 'com.google.appengine', name: 'appengine-endpoints', version: '1.9.48'
+  // Uncomment to use Endpoints Frameworks v1.0 and comment the v2.0 section
+  // compile group: 'com.google.appengine', name: 'appengine-endpoints', version: '+'
   // End of Endpoints Frameworks v1.0
 
   // Endpoints Frameworks v2.0
   // [START endpoints-tools]
-  compile group: 'com.google.endpoints', name: 'endpoints-framework', version: '2.0.7'
+  compile group: 'com.google.endpoints', name: 'endpoints-framework', version: '+'
   // [END endpoints-tools]
   // End of Endpoints Frameworks v2.0
 }
 
@@ -30,27 +30,20 @@ limitations under the License.
     </parent>
 
     <properties>
-        <javax.inject.version>1</javax.inject.version>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
-        <mojo.versions.maven.version>2.3</mojo.versions.maven.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <servlet.api.version>2.5</servlet.api.version>
     </properties>
 
-    <prerequisites>
-        <maven>3.3.9</maven>
-    </prerequisites>
-
     <dependencies>
         <!-- Compile/runtime dependencies -->
-        <!-- Uncomment to use Endpoints Frameworks v1.0 -->
+        <!-- Uncomment to use Endpoints Frameworks v1.0 and comment the v2.0 section -->
         <!--
         [START appengine-endpoints]
         <dependency>
               <groupId>com.google.appengine</groupId>
               <artifactId>appengine-endpoints</artifactId>
-              <version>1.9.48</version>
+              <version>1.9.53</version>
         </dependency>
         [END appengine-endpoints]
         -->
@@ -67,13 +60,13 @@ limitations under the License.
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>${servlet.api.version}</version>
+            <version>2.5</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
-            <version>${javax.inject.version}</version>
+            <version>1</version>
         </dependency>
     </dependencies>
 
@@ -105,7 +98,7 @@ limitations under the License.
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>versions-maven-plugin</artifactId>
-                <version>${mojo.versions.maven.version}</version>
+                <version>2.3</version>
                 <executions>
                     <execution>
                         <phase>compile</phase>
 
@@ -22,6 +22,7 @@
 public class Constants {
   public static final String WEB_CLIENT_ID = "replace this with your web client ID";
   public static final String ANDROID_CLIENT_ID = "replace this with your Android client ID";
+  public static final String IOS_CLIENT_ID = "replace this with your iOS client ID";
   public static final String ANDROID_AUDIENCE = WEB_CLIENT_ID;
 
   public static final String EMAIL_SCOPE = "https://www.googleapis.com/auth/userinfo.email";
 
@@ -34,8 +34,9 @@
  */
 @Api(name = "helloworld",
     version = "v1",
+    // You can add additional SCOPES as a comma separated list of values
     scopes = {Constants.EMAIL_SCOPE},
-    clientIds = {Constants.WEB_CLIENT_ID, Constants.ANDROID_CLIENT_ID},
+    clientIds = {Constants.WEB_CLIENT_ID, Constants.ANDROID_CLIENT_ID, Constants.IOS_CLIENT_ID},
     audiences = {Constants.ANDROID_AUDIENCE}
     )
 public class Greetings {
 
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
 <!--
 Copyright 2017 Google Inc.
 
@@ -14,7 +15,7 @@ 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.
 -->
-    <!-- Uncomment to use Endpoints Frameworks v1.0 -->
+    <!-- Uncomment to use Endpoints Frameworks v1.0 and comment the v2.0 section -->
     <!--
     [START appengine-endpoints]
     <servlet>