Merge pull request #505 from GoogleCloudPlatform/fix-endpoints-discovery

Temporary fix for Endpoints Frameworks v2.0 discovery doc sample
GoogleCloudPlatform · Feb 8, 2017 · a60498c · a60498c
2 parents de8f004 + 532ecf3
commit a60498c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/appengine/endpoints-frameworks-v2/discovery/README.md b/appengine/endpoints-frameworks-v2/discovery/README.md
@@ -96,6 +96,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/
@@ -108,3 +115,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/appengine/endpoints-frameworks-v2/discovery/build.gradle b/appengine/endpoints-frameworks-v2/discovery/build.gradle
@@ -24,9 +24,6 @@ buildscript {    // Configuration for building
 }
 
 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()
 }

diff --git a/appengine/endpoints-frameworks-v2/discovery/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/endpoints-frameworks-v2/discovery/src/main/webapp/WEB-INF/appengine-web.xml
@@ -15,8 +15,8 @@ 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.
 -->
-   <threadsafe>true</threadsafe>
-
+    <threadsafe>true</threadsafe>
+    <version>1</version>
     <system-properties>
         <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
     </system-properties>