From 0c5ccd88f651de9443f62666b107c2fafbbb6b29 Mon Sep 17 00:00:00 2001
From: Frank Natividad <franknatividad@google.com>
Date: Tue, 7 Feb 2017 16:48:13 -0800
Subject: [PATCH] Adding fix to run endpoints archetypes locally.

---
 .../src/main/resources/archetype-resources/README.md      | 7 +++++++
 .../src/main/webapp/WEB-INF/appengine-web.xml             | 1 +
 .../src/main/resources/archetype-resources/README.md      | 8 ++++++++
 .../src/main/webapp/WEB-INF/appengine-web.xml             | 3 ++-
 4 files changed, 18 insertions(+), 1 deletion(-)

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 e1a7c74..51db94e 100644
--- a/endpoints-skeleton-archetype/src/main/resources/archetype-resources/README.md
+++ b/endpoints-skeleton-archetype/src/main/resources/archetype-resources/README.md
@@ -90,6 +90,12 @@ provided [here][9].
 
     `gradle appengineDeploy`
 
+## Known issues
+
+There's a [bug][13] where `<version>1</version>` is required in the
+[appengine-web.xml](src/main/webapp/WEB-INF/appengine-web.xml) to run
+this sample locally. This will become optional in the near future.
+
 
 [1]: https://cloud.google.com/appengine/docs/java/
 [2]: http://java.com/en/
@@ -103,3 +109,4 @@ provided [here][9].
 [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
+[13]: https://github.com/cloudendpoints/endpoints-java/issues/43
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 1e524d6..688eb1d 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,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
     <threadsafe>true</threadsafe>
+    <version>1</version>
 
     <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/README.md b/hello-endpoints-archetype/src/main/resources/archetype-resources/README.md
index 83e905a..08177f1 100644
--- a/hello-endpoints-archetype/src/main/resources/archetype-resources/README.md
+++ b/hello-endpoints-archetype/src/main/resources/archetype-resources/README.md
@@ -99,6 +99,13 @@ provided [here][9].
 
     `gradle appengineDeploy`
 
+## Known issues
+
+There's a [bug][13] where `<version>1</version>` is required in the
+[appengine-web.xml](src/main/webapp/WEB-INF/appengine-web.xml) to run
+this sample locally. This will become optional in the near future.
+
+
 [1]: https://cloud.google.com/appengine/docs/java/
 [2]: http://java.com/en/
 [3]: https://cloud.google.com/appengine/docs/java/endpoints/
@@ -111,3 +118,4 @@ provided [here][9].
 [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
+[13]: https://github.com/cloudendpoints/endpoints-java/issues/43
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 c5de05f..688eb1d 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,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
-   <threadsafe>true</threadsafe>
+    <threadsafe>true</threadsafe>
+    <version>1</version>
 
     <system-properties>
         <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>