diff --git a/endpoints-skeleton-archetype/pom.xml b/endpoints-skeleton-archetype/pom.xml
index 77c116c..8a90dc9 100644
--- a/endpoints-skeleton-archetype/pom.xml
+++ b/endpoints-skeleton-archetype/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2016 Google Inc. All Rights Reserved.
+Copyright 2016 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,18 +17,18 @@ limitations under the License.
 <project>
   <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>com.google.appengine.archetypes</groupId>
-		<artifactId>archetypes</artifactId>
-		<version>1.0.0</version>
-	</parent>
+  <parent>
+      <groupId>com.google.appengine.archetypes</groupId>
+      <artifactId>archetypes</artifactId>
+      <version>1.0.0</version>
+  </parent>
 
   <groupId>com.google.appengine.archetypes</groupId>
   <artifactId>endpoints-skeleton-archetype</artifactId>
-  <version>1.1.5-${appengine.sdk.version}</version>
+  <version>2.0.0</version>
   <packaging>maven-archetype</packaging>
 
   <name>endpoints-skeleton-archetype</name>
-  <description>A skeleton project using Cloud Endpoints with Google App Engine Java</description>
-  <url>https://developers.google.com/appengine/docs/java/endpoints/</url>
+  <description>A skeleton project using Cloud Endpoints with Google App Engine Standard</description>
+  <url>https://cloud.google.com/appengine/docs/java/endpoints/</url>
 </project>
diff --git a/endpoints-skeleton-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/endpoints-skeleton-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index a261354..c652160 100644
--- a/endpoints-skeleton-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/endpoints-skeleton-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -24,36 +24,21 @@
         <include>**/*.properties</include>
       </includes>
     </fileSet>
-    <fileSet encoding="UTF-8">
-      <directory>eclipse-launch-profiles</directory>
-      <includes>
-        <include>**/*.launch</include>
-      </includes>
-    </fileSet>
-    <fileSet encoding="UTF-8">
+    <fileSet filtered="true" encoding="UTF-8">
       <directory></directory>
       <includes>
         <include>LICENSE</include>
         <include>README.md</include>
-        <include>nbactions.xml</include>
+        <include>build.gradle</include>
       </includes>
     </fileSet>
   </fileSets>
   <requiredProperties>
-    <requiredProperty key="appengine-version">
-      <defaultValue>${appengine.sdk.version}</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="application-id">
-      <defaultValue>your-app-id</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="web-client-id">
-      <defaultValue>replace this with your web client ID</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="android-client-id">
-      <defaultValue>replace this with your Android client ID</defaultValue>
+    <requiredProperty key="endpoints-fw">
+      <defaultValue>2.0.0-beta.12</defaultValue>
     </requiredProperty>
-    <requiredProperty key="ios-client-id">
-      <defaultValue>replace this with your iOS client ID</defaultValue>
+    <requiredProperty key="endpoints-p">
+      <defaultValue>1.0.0-beta2</defaultValue>
     </requiredProperty>
   </requiredProperties>
 </archetype-descriptor>
diff --git a/endpoints-skeleton-archetype/src/main/resources/archetype-resources/README.md b/endpoints-skeleton-archetype/src/main/resources/archetype-resources/README.md
index 03bb057..e1a7c74 100644
--- a/endpoints-skeleton-archetype/src/main/resources/archetype-resources/README.md
+++ b/endpoints-skeleton-archetype/src/main/resources/archetype-resources/README.md
@@ -1,57 +1,105 @@
-endpoints-skeleton
-==================
-
-A skeleton application for Google Cloud Endpoints in Java.
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+# Skeleton Google Cloud Endpoints Frameworks for App Engine using a discovery document
+
+This generated sample provides a skeleton to get started with Cloud Endpoints
+Frameworks for App Engine using a discovery document. This sample contains comments
+of how to use the prior Endpoints Frameworks as well. For clarity, the prior Endpoints
+Frameworks and the new Endpoints Frameworks are denoted as Endpoints Frameworks v1.0
+and Endpoints Frameworks v2.0 respectively.
+
+Google Cloud Endpoints Frameworks v2.0 provides new functionality which may
+require payment and uses an OpenAPI specification instead of the discovery document.
+The OpenAPI development process is explained [here][8] and a quickstart is
+provided [here][9].
 
 ## Products
-- [App Engine][1]
+- [Google App Engine Standard][1]
 
 ## Language
 - [Java][2]
 
 ## APIs
-- [Google Cloud Endpoints][3]
-- [Google App Engine Maven plugin][4]
+- [Google Cloud Endpoints Frameworks v2.0][8]
+- [Google Cloud Endpoints Frameworks v1.0][3]
 
-## Setup Instructions
+## Build and Deployment Plugins
+- [Google Cloud Endpoints Frameworks Maven Plugin][10]
+- [Google Cloud Endpoints Frameworks Gradle Plugin][11]
 
-1. Update the value of `application` in `appengine-web.xml` to the app
-   ID you have registered in the App Engine admin console and would
-   like to use to host your instance of this sample.
+## Setup
 
 1. Add your API method to `src/main/java/${packageInPathFormat}/YourFirstAPI.java`.
 
-1. Optional step: These sub steps are not required but you need this
-   if you want to have auth protected methods.
+1. [Optional]: Use Cloud Endpoints Frameworks v1.0.
+
+    - Uncomment Endpoints Frameworks v1.0 sections and comment
+      Endpoints Frameworks v2.0 sections in the following files.
+
+      ```
+        pom.xml
+        build.gradle
+        src/main/webapp/WEB-INF/web.xml
+      ```
+
+## Build and Deployment
+
+###  Maven
+
+1. Build a fresh binary with
 
-    1. Update the values in `src/main/java/${packageInPathFormat}/Constants.java`
-       to reflect the respective client IDs you have registered in the
-       [APIs Console][6]. 
+    `mvn clean compile`
 
-    1. You also need to supply the web client ID you have registered
-       in the [APIs Console][4] to your client of choice (web, Android,
-       iOS).
+1. Run the application locally at [localhost:8080][5] with
 
-1. Run the application with `mvn appengine:devserver`, and ensure it's
-   running by visiting your local server's api explorer's address (by
-   default [localhost:8080/_ah/api/explorer][5].)
+    `mvn appengine:run`
 
-1. Get the client library with
+1. Explore local server's api explorer with
 
-   $ mvnappengine:endpoints_get_client_lib
+  [localhost:8080/_ah/api/explorer][5]
 
-   It will generate a client library jar file under the
-   `target/endpoints-client-libs/<api-name>/target` directory of your
-   project, as well as install the artifact into your local maven
-   repository.
+1. Generate the client library in a zip file named `helloworld-v1-java.zip` with
+
+    `mvn endpoints-framework:clientLibs`
 
 1. Deploy your application to Google App Engine with
 
-   $ mvn appengine:update
+    `mvn appengine:deploy`
+
+### Gradle
+
+1. Build a fresh binary with
+
+    `gradle clean compileJava`
+
+1. Run the application locally at [localhost:8080][5] with
+
+    `gradle appengineRun`
+
+1. Explore local server's api explorer with
+
+  [localhost:8080/_ah/api/explorer][5]
+
+
+1. Generate the client library in a zip file named `helloworld-v1-java.zip` with
+
+    `gradle endpointsClientLibs`
+
+1. Deploy your application to Google App Engine with
+
+    `gradle appengineDeploy`
+
 
-[1]: https://developers.google.com/appengine
+[1]: https://cloud.google.com/appengine/docs/java/
 [2]: http://java.com/en/
-[3]: https://developers.google.com/appengine/docs/java/endpoints/
-[4]: https://developers.google.com/appengine/docs/java/tools/maven
-[5]: https://localhost:8080/_ah/api/explorer
-[6]: https://console.developers.google.com/
+[3]: https://cloud.google.com/appengine/docs/java/endpoints/
+[4]: https://cloud.google.com/appengine/docs/java/tools/maven
+[5]: https://localhost:8080/
+[6]: https://console.developers.google.com/project/_/apiui/credential
+[7]: https://cloud.google.com/appengine/docs/java/endpoints/migrating
+[8]: https://cloud.google.com/endpoints/docs/frameworks/java/about-cloud-endpoints-frameworks
+[9]: https://cloud.google.com/endpoints/docs/frameworks/java/quickstart-frameworks-java
+[10]: https://github.com/GoogleCloudPlatform/endpoints-framework-maven-plugin
+[11]: https://github.com/GoogleCloudPlatform/endpoints-framework-gradle-plugin
+[12]: https://cloud.google.com/endpoints/docs/authenticating-users-frameworks
diff --git a/endpoints-skeleton-archetype/src/main/resources/archetype-resources/build.gradle b/endpoints-skeleton-archetype/src/main/resources/archetype-resources/build.gradle
new file mode 100644
index 0000000..b4fd7db
--- /dev/null
+++ b/endpoints-skeleton-archetype/src/main/resources/archetype-resources/build.gradle
@@ -0,0 +1,72 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+#**
+Copyright 2017 Google Inc.
+
+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.
+*#
+
+buildscript {    // Configuration for building
+  repositories {
+    mavenCentral()
+    jcenter()    // Bintray's repository - a fast Maven Central mirror & more
+  }
+  dependencies {
+    classpath 'com.google.cloud.tools:appengine-gradle-plugin:+'    // latest App Engine Gradle tasks
+    classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:${endpoints-p}'
+  }
+}
+
+repositories {   // repositories for Jar's you access in your code
+  maven {
+    url 'https://oss.sonatype.org/content/repositories/snapshots' // SNAPSHOT Repository (if needed)
+  }
+  mavenCentral()
+  jcenter()
+}
+
+apply plugin: 'java'                              // standard Java tasks
+apply plugin: 'war'                               // standard Web Archive plugin
+apply plugin: 'com.google.cloud.tools.appengine'  // App Engine tasks
+apply plugin: 'com.google.cloud.tools.endpoints-framework-server'
+
+dependencies {
+  providedCompile group: 'javax.servlet', name: 'servlet-api', version:'2.5'
+  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'
+  // End of Endpoints Frameworks v1.0
+
+  // Endpoints Frameworks v2.0
+  compile "com.google.endpoints:endpoints-frameworks:${endpoints-fw}"
+  // End of Endpoints Frameworks v2.0
+}
+
+appengine {  // App Engine tasks configuration
+  run {      // local (dev_appserver) configuration (standard environments only)
+
+  }
+
+  deploy {   // deploy configuration
+
+  }
+}
+
+group   = "${groupId}"        // Generated output GroupId
+version = "1"        // Version in generated output
+
+sourceCompatibility = 1.7     // App Engine Standard uses Java 7
+targetCompatibility = 1.7     // App Engine Standard uses Java 7
diff --git a/endpoints-skeleton-archetype/src/main/resources/archetype-resources/eclipse-launch-profiles/DevAppServer.launch b/endpoints-skeleton-archetype/src/main/resources/archetype-resources/eclipse-launch-profiles/DevAppServer.launch
deleted file mode 100644
index 860aee8..0000000
--- a/endpoints-skeleton-archetype/src/main/resources/archetype-resources/eclipse-launch-profiles/DevAppServer.launch
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
-    <setAttribute key="org.eclipse.debug.core.LAUNCH_MODES">
-        <setEntry value="run"/>
-    </setAttribute>
-    <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-    <stringAttribute key="M2_GOALS" value="appengine:devserver"/>
-    <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-    <booleanAttribute key="M2_OFFLINE" value="false"/>
-    <stringAttribute key="M2_PROFILES" value=""/>
-    <listAttribute key="M2_PROPERTIES"/>
-    <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
-    <booleanAttribute key="M2_SKIP_TESTS" value="false"/>
-    <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-    <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc}"/>
-</launchConfiguration>
diff --git a/endpoints-skeleton-archetype/src/main/resources/archetype-resources/eclipse-launch-profiles/UpdateApplication.launch b/endpoints-skeleton-archetype/src/main/resources/archetype-resources/eclipse-launch-profiles/UpdateApplication.launch
deleted file mode 100644
index 0c59bc9..0000000
--- a/endpoints-skeleton-archetype/src/main/resources/archetype-resources/eclipse-launch-profiles/UpdateApplication.launch
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
-    <setAttribute key="org.eclipse.debug.core.LAUNCH_MODES">
-        <setEntry value="run"/>
-    </setAttribute>
-    <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-    <stringAttribute key="M2_GOALS" value="appengine:update"/>
-    <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-    <booleanAttribute key="M2_OFFLINE" value="false"/>
-    <stringAttribute key="M2_PROFILES" value=""/>
-    <listAttribute key="M2_PROPERTIES"/>
-    <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
-    <booleanAttribute key="M2_SKIP_TESTS" value="false"/>
-    <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-    <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc}"/>
-</launchConfiguration>
diff --git a/endpoints-skeleton-archetype/src/main/resources/archetype-resources/pom.xml b/endpoints-skeleton-archetype/src/main/resources/archetype-resources/pom.xml
index b02a61c..e16500a 100644
--- a/endpoints-skeleton-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/endpoints-skeleton-archetype/src/main/resources/archetype-resources/pom.xml
@@ -1,9 +1,22 @@
 #set( $symbol_pound = '#' )
 #set( $symbol_dollar = '$' )
 #set( $symbol_escape = '\' )
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+#**
+Copyright 2017 Google Inc.
+
+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.
+*#<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
     <version>${version}</version>
@@ -12,15 +25,20 @@
     <artifactId>${artifactId}</artifactId>
 
     <properties>
-        <app.id>${application-id}</app.id>
-        <app.version>1</app.version>
-        <appengine.version>${appengine-version}</appengine.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <!-- Uncomment to use Endpoints Frameworks v1.0 -->
+        <!--
+        <appengine.endpoints.version>1.9.48</appengine.endpoints.version>
+        -->
+        <!-- End of Endpoints Frameworks v1.0 -->
+        <appengine.maven.version>1.0.0</appengine.maven.version>
+        <endpoints.maven.plugin.version>${endpoints-p}</endpoints.maven.plugin.version>
+        <endpoints.framework.version>${endpoints-fw}</endpoints.framework.version>
+        <javax.inject.version>1</javax.inject.version>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
-        <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
-        <archiveClasses>true</archiveClasses>
+        <mojo.versions.maven.version>2.1</mojo.versions.maven.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <servlet.api.version>2.5</servlet.api.version>
     </properties>
 
     <prerequisites>
@@ -29,52 +47,30 @@
 
     <dependencies>
         <!-- Compile/runtime dependencies -->
+        <!-- Uncomment to use Endpoints Framework v1.0 -->
+        <!--<dependency>
+              <groupId>com.google.appengine</groupId>
+              <artifactId>appengine-endpoints</artifactId>
+              <version>${appengine.endpoints.version}</version>
+        </dependency>-->
+        <!-- End of Endpoints Framework v1.0 -->
+        <!-- Endpoints Framework v2.0 -->
         <dependency>
-            <groupId>com.google.appengine</groupId>
-            <artifactId>appengine-api-1.0-sdk</artifactId>
-            <version>${appengine.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.appengine</groupId>
-            <artifactId>appengine-endpoints</artifactId>
-            <version>${appengine.version}</version>
+            <groupId>com.google.endpoints</groupId>
+            <artifactId>endpoints-framework</artifactId>
+            <version>${endpoints.framework.version}</version>
         </dependency>
+        <!-- End of Endpoints Framework v2.0 -->
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
+            <version>${servlet.api.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
-            <version>1</version>
-        </dependency>
-
-        <!-- Test Dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>2.0.2-beta</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.appengine</groupId>
-            <artifactId>appengine-testing</artifactId>
-            <version>${appengine.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.appengine</groupId>
-            <artifactId>appengine-api-stubs</artifactId>
-            <version>${appengine.version}</version>
-            <scope>test</scope>
+            <version>${javax.inject.version}</version>
         </dependency>
     </dependencies>
 
@@ -83,65 +79,44 @@
         <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>versions-maven-plugin</artifactId>
-                <version>2.1</version>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>${appengine.maven.version}</version>
+                <configuration>
+                    <!-- deploy configuration -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>endpoints-framework-maven-plugin</artifactId>
+                <version>${endpoints.maven.plugin.version}</version>
+                <configuration>
+                    <webappDir>src/main/webapp</webappDir>
+                    <discoveryDocDir>${project.build.directory}/generated-sources/appengine-endpoints/WEB-INF</discoveryDocDir>
+                </configuration>
                 <executions>
                     <execution>
-                        <phase>compile</phase>
+                        <phase>generate-sources</phase>
                         <goals>
-                            <goal>display-dependency-updates</goal>
-                            <goal>display-plugin-updates</goal>
+                            <goal>discoveryDocs</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <webXml>${project.build.directory}/generated-sources/appengine-endpoints/WEB-INF/web.xml</webXml>
-                    <webResources>
-                        <resource>
-                            <!-- this is relative to the pom.xml directory -->
-                            <directory>${project.build.directory}/generated-sources/appengine-endpoints</directory>
-                            <!-- the list has a default value of ** -->
-                            <includes>
-                                <include>WEB-INF/*.discovery</include>
-                                <include>WEB-INF/*.api</include>
-                            </includes>
-                        </resource>
-                    </webResources>
-                </configuration>
-            </plugin>
-
             <plugin>
-                <groupId>com.google.appengine</groupId>
-                <artifactId>appengine-maven-plugin</artifactId>
-                <version>${appengine.version}</version>
-                <configuration>
-                    <enableJarClasses>false</enableJarClasses>
-                    <version>${app.version}</version>
-                    <!-- Comment in the below snippet to bind to all IPs instead of just localhost -->
-                    <!-- address>0.0.0.0</address>
-                    <port>8080</port -->
-                    <!-- Comment in the below snippet to enable local debugging with a remote debugger
-                         like those included with Eclipse or IntelliJ -->
-                    <!-- jvmFlags>
-                      <jvmFlag>-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n</jvmFlag>
-                    </jvmFlags -->
-                </configuration>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>${mojo.versions.maven.version}</version>
                 <executions>
                     <execution>
+                        <phase>compile</phase>
                         <goals>
-                            <goal>endpoints_get_discovery_doc</goal>
+                            <goal>display-dependency-updates</goal>
+                            <goal>display-plugin-updates</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
-
 </project>
diff --git a/endpoints-skeleton-archetype/src/main/resources/archetype-resources/src/main/java/Constants.java b/endpoints-skeleton-archetype/src/main/resources/archetype-resources/src/main/java/Constants.java
deleted file mode 100644
index d25ec4d..0000000
--- a/endpoints-skeleton-archetype/src/main/resources/archetype-resources/src/main/java/Constants.java
+++ /dev/null
@@ -1,16 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-package ${package};
-
-/**
- * Contains the client IDs and scopes for allowed clients consuming your API.
- */
-public class Constants {
-  public static final String WEB_CLIENT_ID = "${web-client-id}";
-  public static final String ANDROID_CLIENT_ID = "${android-client-id}";
-  public static final String IOS_CLIENT_ID = "${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";
-}
diff --git a/endpoints-skeleton-archetype/src/main/resources/archetype-resources/src/main/java/YourFirstAPI.java b/endpoints-skeleton-archetype/src/main/resources/archetype-resources/src/main/java/YourFirstAPI.java
index e474417..97a81cf 100644
--- a/endpoints-skeleton-archetype/src/main/resources/archetype-resources/src/main/java/YourFirstAPI.java
+++ b/endpoints-skeleton-archetype/src/main/resources/archetype-resources/src/main/java/YourFirstAPI.java
@@ -3,9 +3,13 @@
 #set( $symbol_escape = '\' )
 package ${package};
 
+import com.google.api.server.spi.config.Api;
+
 /**
   * Add your first API methods in this class, or you may create another class. In that case, please
   * update your web.xml accordingly.
  **/
+@Api(name = "skeleton-api",
+     version = "v1")
 public class YourFirstAPI {
 }
diff --git a/endpoints-skeleton-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml b/endpoints-skeleton-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml
index 1c95586..1e524d6 100644
--- a/endpoints-skeleton-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/endpoints-skeleton-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,10 +1,5 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
 <?xml version="1.0" encoding="utf-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
-    <application>${app.id}</application>
-    <version>${app.version}</version>
     <threadsafe>true</threadsafe>
 
     <system-properties>
diff --git a/endpoints-skeleton-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/endpoints-skeleton-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index 5d4f926..f217f0b 100644
--- a/endpoints-skeleton-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/endpoints-skeleton-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -1,18 +1,53 @@
 #set( $symbol_pound = '#' )
 #set( $symbol_dollar = '$' )
 #set( $symbol_escape = '\' )
-<?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.
+
+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.
+*#<?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">
+
     <servlet>
+        <!-- Uncomment to use Endpoints Frameworks v1.0 -->
+        <!--
         <servlet-name>SystemServiceServlet</servlet-name>
         <servlet-class>com.google.api.server.spi.SystemServiceServlet</servlet-class>
+        -->
+        <!-- End of Endpoints Frameworks v1.0 -->
+        <!-- Endpoints Frameworks v2.0 -->
+        <servlet-name>EndpointsServlet</servlet-name>
+        <servlet-class>com.google.api.server.spi.EndpointsServlet</servlet-class>
+        <!-- End of Endpoints Frameworks v2.0 -->
         <init-param>
             <param-name>services</param-name>
             <param-value>${package}.YourFirstAPI</param-value>
         </init-param>
+        <init-param>
+            <param-name>restricted</param-name>
+            <param-value>false</param-value>
+        </init-param>
     </servlet>
     <servlet-mapping>
+        <!-- Uncomment to use Endpoints Frameworks v1.0 -->
+        <!--
         <servlet-name>SystemServiceServlet</servlet-name>
         <url-pattern>/_ah/spi/*</url-pattern>
+        -->
+        <!-- End of Endpoints Frameworks v1.0 -->
+        <!-- Endpoints Frameworks v2.0 -->
+        <servlet-name>EndpointsServlet</servlet-name>
+        <url-pattern>/_ah/api/*</url-pattern>
+        <!-- End of Endpoints Frameworks v2.0 -->
     </servlet-mapping>
     <welcome-file-list>
         <welcome-file>index.html</welcome-file>
diff --git a/endpoints-skeleton-archetype/src/test/resources/projects/basic/archetype.properties b/endpoints-skeleton-archetype/src/test/resources/projects/basic/archetype.properties
index 495bc4c..74918bc 100644
--- a/endpoints-skeleton-archetype/src/test/resources/projects/basic/archetype.properties
+++ b/endpoints-skeleton-archetype/src/test/resources/projects/basic/archetype.properties
@@ -1,10 +1,7 @@
-#Tue May 06 16:04:48 PDT 2014
+# Tue Jan 31 11:39:16 PST 2017
 package=it.pkg
 version=0.1-SNAPSHOT
 groupId=archetype.it
 artifactId=basic
-appengine-version=1.9.38
-application-id=your-app-id
-web-client-id=replace this with your web client ID
-android-client-id=replace this with your Android client ID
-ios-client-id=replace this with your iOS client ID
+endpoints-fw=2.0.0-beta.12
+endpoints-p=1.0.0-beta2
diff --git a/hello-endpoints-archetype/Jenkins.sh b/hello-endpoints-archetype/Jenkins.sh
new file mode 100644
index 0000000..ddb1ea1
--- /dev/null
+++ b/hello-endpoints-archetype/Jenkins.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+# Fail on non-zero return and print
+set -xe
+
+# Jenkins Test Script
+function TestEndpoints () {
+  # Test getGreeting Endpoint (hello world!)
+  curl -X GET \
+    "https://${2}-dot-${1}.appspot.com/_ah/api/helloworld/v1/hellogreeting/0" | \
+    grep "hello version-${2}"
+
+  # Test getGreeting Endpoint (goodbye world!)
+  curl -X GET \
+    "https://${2}-dot-${1}.appspot.com/_ah/api/helloworld/v1/hellogreeting/1" | \
+    grep "goodbye world!"
+
+  # Test listGreeting Endpoint (hello world! and goodbye world!)
+  curl -X GET \
+    "https://${2}-dot-${1}.appspot.com/_ah/api/helloworld/v1/hellogreeting" | \
+    grep "hello world!\|goodbye world!"
+
+  # Test multiply Endpoint (This is a greeting.)
+  curl -X POST \
+    -H "Content-Type: application/json" \
+    --data "{'message':'This is a greeting from instance ${2}'}." \
+    "https://${2}-dot-${1}.appspot.com/_ah/api/helloworld/v1/hellogreeting/1" | \
+    grep "This is a greeting from instance ${2}."
+}
+
+# Build Test Archetype
+mvn verify
+
+# Change path to generated archetype
+pushd target/test-classes/projects/basic/project/basic
+
+# Jenkins provides values for GOOGLE_PROJECT_ID and GOOGLE_VERSION_ID
+# Update Greetings.java
+sed -i'.bak' -e "s/hello world!/hello version-${GOOGLE_VERSION_ID}!/g" src/main/java/it/pkg/Greetings.java
+
+# Attempt to clean and deploy generated archetype
+mvn clean appengine:deploy \
+    -Dapp.deploy.version="${GOOGLE_VERSION_ID}"
+
+# End-2-End tests
+TestEndpoints "${GOOGLE_PROJECT_ID}" "${GOOGLE_VERSION_ID}"
+
+# Clean
+mvn clean
+
+# Set deploy version
+sed -i'.bak' -e "s/deploy {/deploy {\n version='${GOOGLE_VERSION_ID}'/g" build.gradle
+
+# Modify Greetings.java for Gradle
+sed -i'.bak' -e "s/hello version-${GOOGLE_VERSION_ID}!/hello version-gradle-${GOOGLE_VERSION_ID}!/g" src/main/java/it/pkg/Greetings.java
+
+# Deploy
+gradle appengineDeploy
+
+# End-2-End tests
+TestEndpoints "${GOOGLE_PROJECT_ID}" "gradle-${GOOGLE_VERSION_ID}"
+
+# Clean up
+gradle clean
+
+# Pop from generated archetype
+popd
+
+
diff --git a/hello-endpoints-archetype/pom.xml b/hello-endpoints-archetype/pom.xml
index 152bea5..7a8e3fa 100644
--- a/hello-endpoints-archetype/pom.xml
+++ b/hello-endpoints-archetype/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2016 Google Inc. All Rights Reserved.
+Copyright 2017 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,18 +17,18 @@ limitations under the License.
 <project>
   <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>com.google.appengine.archetypes</groupId>
-		<artifactId>archetypes</artifactId>
-		<version>1.0.0</version>
-	</parent>
+  <parent>
+      <groupId>com.google.appengine.archetypes</groupId>
+      <artifactId>archetypes</artifactId>
+      <version>1.0.0</version>
+  </parent>
 
   <groupId>com.google.appengine.archetypes</groupId>
   <artifactId>hello-endpoints-archetype</artifactId>
-  <version>1.1.5-${appengine.sdk.version}</version>
+  <version>2.0.0</version>
   <packaging>maven-archetype</packaging>
 
   <name>hello-endpoints-archetype</name>
-  <description>A simple starter application using Cloud Endpoints with Google App Engine Java</description>
-  <url>https://github.com/GoogleCloudPlatform/appengine-endpoints-helloendpoints-java-maven</url>
+  <description>A simple starter application using Cloud Endpoints with Google App Engine Standard</description>
+  <url>https://cloud.google.com/appengine/docs/java/endpoints/</url>
 </project>
diff --git a/hello-endpoints-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/hello-endpoints-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 2af786b..67a6476 100644
--- a/hello-endpoints-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/hello-endpoints-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -24,27 +24,22 @@
         <include>**/*.properties</include>
       </includes>
     </fileSet>
-    <fileSet encoding="UTF-8">
-      <directory>eclipse-launch-profiles</directory>
-      <includes>
-        <include>**/*.launch</include>
-      </includes>
-    </fileSet>
-    <fileSet encoding="UTF-8">
+    <fileSet filtered="true" encoding="UTF-8">
       <directory></directory>
       <includes>
-        <include>nbactions.xml</include>
         <include>README.md</include>
         <include>LICENSE</include>
+        <include>build.gradle</include>
+        <include>Jenkins.sh</include>
       </includes>
     </fileSet>
   </fileSets>
   <requiredProperties>
-    <requiredProperty key="appengine-version">
-      <defaultValue>${appengine.sdk.version}</defaultValue>
+    <requiredProperty key="endpoints-fw">
+      <defaultValue>2.0.0-beta.12</defaultValue>
     </requiredProperty>
-    <requiredProperty key="application-id">
-      <defaultValue>your-app-id</defaultValue>
+    <requiredProperty key="endpoints-p">
+      <defaultValue>1.0.0-beta2</defaultValue>
     </requiredProperty>
     <requiredProperty key="web-client-id">
       <defaultValue>replace this with your web client ID</defaultValue>
diff --git a/hello-endpoints-archetype/src/main/resources/archetype-resources/README.md b/hello-endpoints-archetype/src/main/resources/archetype-resources/README.md
index f6bef81..83e905a 100644
--- a/hello-endpoints-archetype/src/main/resources/archetype-resources/README.md
+++ b/hello-endpoints-archetype/src/main/resources/archetype-resources/README.md
@@ -1,56 +1,113 @@
-appengine-endpoints-helloendpoints-java-maven
-=============================================
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+# Hello World Google Cloud Endpoints Frameworks for App Engine using a discovery document
+
+This generated sample provides an example of a [migration][7] from the prior version of
+[Google Cloud Endpoints Frameworks][3] to new [Google Cloud Endpoints Frameworks for App Engine][8]
+while still using a discovery document. This sample contains comments of how to 
+use the prior Endpoints Frameworks as well. For clarity, the prior Endpoints
+Frameworks and the new Endpoints Frameworks are denoted as Endpoints Frameworks v1.0
+and Endpoints Frameworks v2.0 respectively.
+
+Google Cloud Endpoints Frameworks v2.0 provides new functionality which may
+require payment and uses an OpenAPI specification instead of the discovery document.
+The OpenAPI development process is explained [here][8] and a quickstart is
+provided [here][9].
 
-A "hello world" application for Google Cloud Endpoints in Java.
 
 ## Products
-- [App Engine][1]
+- [Google App Engine Standard][1]
 
 ## Language
 - [Java][2]
 
 ## APIs
-- [Google Cloud Endpoints][3]
-- [Google App Engine Maven plugin][4]
+- [Google Cloud Endpoints Frameworks v2.0][8]
+- [Google Cloud Endpoints Frameworks v1.0][3]
+
+## Build and Deployment Plugins
+- [Google Cloud Endpoints Frameworks Maven Plugin][10]
+- [Google Cloud Endpoints Frameworks Gradle Plugin][11]
+
+## Setup
+1. [Optional]: User Authenticating with Google Accounts in Web Clients
+
+    1. Update the `WEB_CLIENT_ID` in [Constants.java](src/main/java/${packageInPathFormat}/Constants.java)
+      to reflect the web client ID you have registered in the [Credentials on Developers Console for OAuth 2.0 client IDs][6].
+
+    1. Update the value of `google.devrel.samples.helloendpoints.CLIENT_ID` in [base.js](src/main/webapp/js/base.js)
+       to reflect the web client ID you have registered in the [Credentials on Developers Console for OAuth 2.0 client IDs][6].
+
+1. [Optional]: User Authenticating with Google Accounts in other Applications Types
+
+    - Inside [Constants.java](src/main/java/${packageInPathFormat}/Constants.java) you will find placeholders for Android
+      and iOS applications using Google Accounts client IDs registered in the
+      [Credentials on Developers Console for OAuth 2.0 client IDs][6].
+
+    - These client IDs are used when defining annotation for this sample API found in [Greetings.java](src/main/java/${packageInPathFormat}/Greetings.java).
+
+    - You can read more about different user authentication supported [here][12].
+
+1. [Optional]: Use Cloud Endpoints Frameworks v2.0 Maven and Gradle discovery and
+   client library generation plugins with Cloud Endpoints Frameworks v1.0.
 
-## Setup Instructions
+    - Uncomment `Endpoints Frameworks v1.0` sections and comment
+        `Endpoints Frameworks v2.0` sections in the following files.
+
+      ```
+        pom.xml
+        build.gradle
+        src/main/webapp/WEB-INF/web.xml
+      ```
+
+## Build and Deployment
+
+###  Maven
+
+1. Build a fresh binary with
+
+    `mvn clean compile`
+
+1. Run the application locally at [localhost:8080][5] with
+
+    `mvn appengine:run`
+
+1. Generate the client library in a zip file named `helloworld-v1-java.zip` with
+
+    `mvn endpoints-framework:clientLibs`
+
+1. Deploy your application to Google App Engine with
 
-1. Update the value of `application` in `appengine-web.xml` to the app
-   ID you have registered in the App Engine admin console and would
-   like to use to host your instance of this sample.
+    `mvn appengine:deploy`
 
-1. Optional step: These sub steps are not required but you need to do
-   this if you want to use auth protected API methods.
+### Gradle
 
-    1. Update the values in `src/main/java/${packageInPathFormat}/Constants.java`
-       to reflect the respective client IDs you have registered in the
-       [APIs Console][6].
+1. Build a fresh binary with
 
-    1. Update the value of `google.devrel.samples.helloendpoints.CLIENT_ID`
-       in `src/main/webapp/base.js` to reflect the web client ID you have
-       registered in the [APIs Console][4].
+    `gradle clean compileJava`
 
-1. Run the application with `mvn appengine:devserver`, and ensure it's
-   running by visiting your local server's address (by default
-   [localhost:8080][5].)
+1. Run the application locally at [localhost:8080][5] with
 
-1. Get the client library with
+    `gradle appengineRun`
 
-   $ mvn appengine:endpoints_get_client_lib
+1. Generate the client library in a zip file named `helloworld-v1-java.zip` with
 
-   It will generate a jar file named something like
-   `helloworld-v1-1.18.0-rc-SNAPSHOT.jar` under the
-   `target/endpoints-client-libs/<api-name>/target` directory of your
-   project, as well as install the artifact into your local maven
-   repository.
+    `gradle endpointsClientLibs`
 
 1. Deploy your application to Google App Engine with
 
-   $ mvn appengine:update
+    `gradle appengineDeploy`
 
-[1]: https://developers.google.com/appengine
+[1]: https://cloud.google.com/appengine/docs/java/
 [2]: http://java.com/en/
-[3]: https://developers.google.com/appengine/docs/java/endpoints/
-[4]: https://developers.google.com/appengine/docs/java/tools/maven
+[3]: https://cloud.google.com/appengine/docs/java/endpoints/
+[4]: https://cloud.google.com/appengine/docs/java/tools/maven
 [5]: https://localhost:8080/
-[6]: https://console.developers.google.com/
+[6]: https://console.developers.google.com/project/_/apiui/credential
+[7]: https://cloud.google.com/appengine/docs/java/endpoints/migrating
+[8]: https://cloud.google.com/endpoints/docs/frameworks/java/about-cloud-endpoints-frameworks
+[9]: https://cloud.google.com/endpoints/docs/frameworks/java/quickstart-frameworks-java
+[10]: https://github.com/GoogleCloudPlatform/endpoints-framework-maven-plugin
+[11]: https://github.com/GoogleCloudPlatform/endpoints-framework-gradle-plugin
+[12]: https://cloud.google.com/endpoints/docs/authenticating-users-frameworks
diff --git a/hello-endpoints-archetype/src/main/resources/archetype-resources/build.gradle b/hello-endpoints-archetype/src/main/resources/archetype-resources/build.gradle
new file mode 100644
index 0000000..a723f81
--- /dev/null
+++ b/hello-endpoints-archetype/src/main/resources/archetype-resources/build.gradle
@@ -0,0 +1,73 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+
+#**
+Copyright 2017 Google Inc.
+
+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.
+*#
+
+buildscript {    // Configuration for building
+  repositories {
+    mavenCentral()
+    jcenter()    // Bintray's repository - a fast Maven Central mirror & more
+  }
+  dependencies {
+    classpath 'com.google.cloud.tools:appengine-gradle-plugin:+'    // latest App Engine Gradle tasks
+    classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:${endpoints-p}'
+  }
+}
+
+repositories {   // repositories for Jar's you access in your code
+  maven {
+    url 'https://oss.sonatype.org/content/repositories/snapshots' // SNAPSHOT Repository (if needed)
+  }
+  mavenCentral()
+  jcenter()
+}
+
+apply plugin: 'java'                              // standard Java tasks
+apply plugin: 'war'                               // standard Web Archive plugin
+apply plugin: 'com.google.cloud.tools.appengine'  // App Engine tasks
+apply plugin: 'com.google.cloud.tools.endpoints-framework-server'
+
+dependencies {
+  providedCompile group: 'javax.servlet', name: 'servlet-api', version:'2.5'
+  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'
+  // End of Endpoints Frameworks v1.0
+
+  // Endpoints Frameworks v2.0
+  compile "com.google.endpoints:endpoints-framework:${endpoints-fw}"
+  // End of Endpoints Frameworks v2.0
+}
+
+appengine {  // App Engine tasks configuration
+  run {      // local (dev_appserver) configuration (standard environments only)
+
+  }
+
+  deploy {   // deploy configuration
+
+  }
+}
+
+group   = "${groupId}"        // Generated output GroupId
+version = "1"        // Version in generated output
+
+sourceCompatibility = 1.7     // App Engine Standard uses Java 7
+targetCompatibility = 1.7     // App Engine Standard uses Java 7
diff --git a/hello-endpoints-archetype/src/main/resources/archetype-resources/eclipse-launch-profiles/DevAppServer.launch b/hello-endpoints-archetype/src/main/resources/archetype-resources/eclipse-launch-profiles/DevAppServer.launch
deleted file mode 100644
index 860aee8..0000000
--- a/hello-endpoints-archetype/src/main/resources/archetype-resources/eclipse-launch-profiles/DevAppServer.launch
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
-    <setAttribute key="org.eclipse.debug.core.LAUNCH_MODES">
-        <setEntry value="run"/>
-    </setAttribute>
-    <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-    <stringAttribute key="M2_GOALS" value="appengine:devserver"/>
-    <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-    <booleanAttribute key="M2_OFFLINE" value="false"/>
-    <stringAttribute key="M2_PROFILES" value=""/>
-    <listAttribute key="M2_PROPERTIES"/>
-    <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
-    <booleanAttribute key="M2_SKIP_TESTS" value="false"/>
-    <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-    <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc}"/>
-</launchConfiguration>
diff --git a/hello-endpoints-archetype/src/main/resources/archetype-resources/eclipse-launch-profiles/UpdateApplication.launch b/hello-endpoints-archetype/src/main/resources/archetype-resources/eclipse-launch-profiles/UpdateApplication.launch
deleted file mode 100644
index 0c59bc9..0000000
--- a/hello-endpoints-archetype/src/main/resources/archetype-resources/eclipse-launch-profiles/UpdateApplication.launch
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
-    <setAttribute key="org.eclipse.debug.core.LAUNCH_MODES">
-        <setEntry value="run"/>
-    </setAttribute>
-    <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-    <stringAttribute key="M2_GOALS" value="appengine:update"/>
-    <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-    <booleanAttribute key="M2_OFFLINE" value="false"/>
-    <stringAttribute key="M2_PROFILES" value=""/>
-    <listAttribute key="M2_PROPERTIES"/>
-    <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
-    <booleanAttribute key="M2_SKIP_TESTS" value="false"/>
-    <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-    <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc}"/>
-</launchConfiguration>
diff --git a/hello-endpoints-archetype/src/main/resources/archetype-resources/pom.xml b/hello-endpoints-archetype/src/main/resources/archetype-resources/pom.xml
index 48364ef..d26194d 100644
--- a/hello-endpoints-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/hello-endpoints-archetype/src/main/resources/archetype-resources/pom.xml
@@ -1,4 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+#**
+Copyright 2017 Google Inc.
+
+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.
+*#<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -9,16 +26,20 @@
     <artifactId>${artifactId}</artifactId>
 
     <properties>
-        <app.id>${application-id}</app.id>
-        <app.version>1</app.version>
-        <appengine.version>${appengine-version}</appengine.version>
-
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <!-- Uncomment to use Endpoints Frameworks v1.0 -->
+        <!--
+        <appengine.endpoints.version>1.9.48</appengine.endpoints.version>
+        -->
+        <!-- End of Endpoints Frameworks v1.0 -->
+        <appengine.maven.version>1.0.0</appengine.maven.version>
+        <endpoints.maven.plugin.version>${endpoints-p}</endpoints.maven.plugin.version>
+        <endpoints.framework.version>${endpoints-fw}</endpoints.framework.version>
+        <javax.inject.version>1</javax.inject.version>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
-        <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
-        <archiveClasses>true</archiveClasses>
+        <mojo.versions.maven.version>2.1</mojo.versions.maven.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <servlet.api.version>2.5</servlet.api.version>
     </properties>
 
     <prerequisites>
@@ -27,57 +48,30 @@
 
     <dependencies>
         <!-- Compile/runtime dependencies -->
+        <!-- Uncomment to use Endpoints Frameworks v1.0 -->
+        <!--<dependency>
+              <groupId>com.google.appengine</groupId>
+              <artifactId>appengine-endpoints</artifactId>
+              <version>${appengine.endpoints.version}</version>
+        </dependency>-->
+        <!-- End of Endpoints Frameworks v1.0 -->
+        <!-- Endpoints Frameworks v2.0 -->
         <dependency>
-            <groupId>com.google.appengine</groupId>
-            <artifactId>appengine-api-1.0-sdk</artifactId>
-            <version>${appengine.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.appengine</groupId>
-            <artifactId>appengine-endpoints</artifactId>
-            <version>${appengine.version}</version>
+            <groupId>com.google.endpoints</groupId>
+            <artifactId>endpoints-framework</artifactId>
+            <version>${endpoints.framework.version}</version>
         </dependency>
+        <!-- End of Endpoints Frameworks v2.0 -->
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
+            <version>${servlet.api.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
-            <version>1</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.jdo</groupId>
-            <artifactId>jdo-api</artifactId>
-            <version>3.1</version>
-        </dependency>
-
-        <!-- Test Dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>2.0.2-beta</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.appengine</groupId>
-            <artifactId>appengine-testing</artifactId>
-            <version>${appengine.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.appengine</groupId>
-            <artifactId>appengine-api-stubs</artifactId>
-            <version>${appengine.version}</version>
-            <scope>test</scope>
+            <version>${javax.inject.version}</version>
         </dependency>
     </dependencies>
 
@@ -86,64 +80,44 @@
         <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>versions-maven-plugin</artifactId>
-                <version>2.1</version>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>${appengine.maven.version}</version>
+                <configuration>
+                    <!-- deploy configuration -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>endpoints-framework-maven-plugin</artifactId>
+                <version>${endpoints.maven.plugin.version}</version>
+                <configuration>
+                    <webappDir>src/main/webapp</webappDir>
+                    <discoveryDocDir>${project.build.directory}/generated-sources/appengine-endpoints/WEB-INF</discoveryDocDir>
+                </configuration>
                 <executions>
                     <execution>
-                        <phase>compile</phase>
+                        <phase>generate-sources</phase>
                         <goals>
-                            <goal>display-dependency-updates</goal>
-                            <goal>display-plugin-updates</goal>
+                            <goal>discoveryDocs</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <webXml>${project.build.directory}/generated-sources/appengine-endpoints/WEB-INF/web.xml</webXml>
-                    <webResources>
-                        <resource>
-                            <!-- this is relative to the pom.xml directory -->
-                            <directory>${project.build.directory}/generated-sources/appengine-endpoints</directory>
-                            <!-- the list has a default value of ** -->
-                            <includes>
-                                <include>WEB-INF/*.discovery</include>
-                                <include>WEB-INF/*.api</include>
-                            </includes>
-                        </resource>
-                    </webResources>
-                </configuration>
-            </plugin>
             <plugin>
-                <groupId>com.google.appengine</groupId>
-                <artifactId>appengine-maven-plugin</artifactId>
-                <version>${appengine.version}</version>
-                <configuration>
-                    <enableJarClasses>false</enableJarClasses>
-                    <version>${app.version}</version>
-                    <!-- Comment in the below snippet to bind to all IPs instead of just localhost -->
-                    <!-- address>0.0.0.0</address>
-                    <port>8080</port -->
-                    <!-- Comment in the below snippet to enable local debugging with a remote debugger
-                         like those included with Eclipse or IntelliJ -->
-                    <!-- jvmFlags>
-                      <jvmFlag>-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n</jvmFlag>
-                    </jvmFlags -->
-                </configuration>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>${mojo.versions.maven.version}</version>
                 <executions>
                     <execution>
+                        <phase>compile</phase>
                         <goals>
-                            <goal>endpoints_get_discovery_doc</goal>
+                            <goal>display-dependency-updates</goal>
+                            <goal>display-plugin-updates</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
-
 </project>
diff --git a/hello-endpoints-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml b/hello-endpoints-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml
index 1c95586..c5de05f 100644
--- a/hello-endpoints-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/hello-endpoints-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,11 +1,6 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
 <?xml version="1.0" encoding="utf-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
-    <application>${app.id}</application>
-    <version>${app.version}</version>
-    <threadsafe>true</threadsafe>
+   <threadsafe>true</threadsafe>
 
     <system-properties>
         <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
diff --git a/hello-endpoints-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/hello-endpoints-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index 89fa067..bebf56a 100644
--- a/hello-endpoints-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/hello-endpoints-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -1,18 +1,53 @@
 #set( $symbol_pound = '#' )
 #set( $symbol_dollar = '$' )
 #set( $symbol_escape = '\' )
-<?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.
+
+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.
+*#<?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">
+
     <servlet>
+        <!-- Uncomment to use Endpoints Frameworks v1.0 -->
+        <!--
         <servlet-name>SystemServiceServlet</servlet-name>
         <servlet-class>com.google.api.server.spi.SystemServiceServlet</servlet-class>
+        -->
+        <!-- End of Endpoints Frameworks v1.0 -->
+        <!-- Endpoints Frameworks v2.0 -->
+        <servlet-name>EndpointsServlet</servlet-name>
+        <servlet-class>com.google.api.server.spi.EndpointsServlet</servlet-class>
+        <!-- End of Endpoints Frameworks v2.0 -->
         <init-param>
             <param-name>services</param-name>
             <param-value>${package}.Greetings</param-value>
         </init-param>
+        <init-param>
+            <param-name>restricted</param-name>
+            <param-value>false</param-value>
+        </init-param>
     </servlet>
     <servlet-mapping>
+        <!-- Uncomment to use Endpoints Frameworks v1.0 -->
+        <!--
         <servlet-name>SystemServiceServlet</servlet-name>
         <url-pattern>/_ah/spi/*</url-pattern>
+        -->
+        <!-- End of Endpoints Frameworks v1.0 -->
+        <!-- Endpoints Frameworks v2.0 -->
+        <servlet-name>EndpointsServlet</servlet-name>
+        <url-pattern>/_ah/api/*</url-pattern>
+        <!-- End of Endpoints Frameworks v2.0 -->
     </servlet-mapping>
     <welcome-file-list>
         <welcome-file>index.html</welcome-file>
diff --git a/hello-endpoints-archetype/src/test/resources/projects/basic/archetype.properties b/hello-endpoints-archetype/src/test/resources/projects/basic/archetype.properties
index 495bc4c..55e3db8 100644
--- a/hello-endpoints-archetype/src/test/resources/projects/basic/archetype.properties
+++ b/hello-endpoints-archetype/src/test/resources/projects/basic/archetype.properties
@@ -1,10 +1,10 @@
-#Tue May 06 16:04:48 PDT 2014
+#Tue January 17 11:54:00 PDT 2017
 package=it.pkg
 version=0.1-SNAPSHOT
 groupId=archetype.it
 artifactId=basic
-appengine-version=1.9.38
-application-id=your-app-id
+endpoints-fw=2.0.0-beta.12
+endpoints-p=1.0.0-beta2
 web-client-id=replace this with your web client ID
 android-client-id=replace this with your Android client ID
 ios-client-id=replace this with your iOS client ID