From e2e81101e3321140469382ff2c6ac1bae4f4a499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20P=C3=B6hler?= Date: Mon, 10 Jul 2017 19:39:43 +0200 Subject: [PATCH 1/2] fix for #747, replaceProjectId wrong directory --- appengine-java8/endpoints-v2-backend/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appengine-java8/endpoints-v2-backend/build.gradle b/appengine-java8/endpoints-v2-backend/build.gradle index e09ba4c3851..c9fe68c9a4a 100644 --- a/appengine-java8/endpoints-v2-backend/build.gradle +++ b/appengine-java8/endpoints-v2-backend/build.gradle @@ -54,14 +54,14 @@ endpointsServer { hostname = "echo-api.endpoints.${projectId}.cloud.goog" } -sourceCompatibility = 1.7 // App Engine Standard uses Java 7 -targetCompatibility = 1.7 // App Engine Standard uses Java 7 +sourceCompatibility = 1.8 +targetCompatibility = 1.8 // this replaces the ${endpoints.project.id} in appengine-web.xml and web.xml task replaceProjectId(type: Copy) { from 'src/main/webapp/WEB-INF/' include '*.xml' - into 'build/exploded-backend/WEB-INF' + into 'build/exploded-${archivesBaseName}/WEB-INF' expand(endpoints:[project:[id:projectId]]) filteringCharset = 'UTF-8' } From b2fc1876a18411b6324440923ac2f607ed4afee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20P=C3=B6hler?= Date: Mon, 10 Jul 2017 22:48:07 +0200 Subject: [PATCH 2/2] replaced single quotes with double quotes to make substitution work. --- appengine-java8/endpoints-v2-backend/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appengine-java8/endpoints-v2-backend/build.gradle b/appengine-java8/endpoints-v2-backend/build.gradle index c9fe68c9a4a..275b0454ae2 100644 --- a/appengine-java8/endpoints-v2-backend/build.gradle +++ b/appengine-java8/endpoints-v2-backend/build.gradle @@ -61,7 +61,7 @@ targetCompatibility = 1.8 task replaceProjectId(type: Copy) { from 'src/main/webapp/WEB-INF/' include '*.xml' - into 'build/exploded-${archivesBaseName}/WEB-INF' + into "build/exploded-${archivesBaseName}/WEB-INF" expand(endpoints:[project:[id:projectId]]) filteringCharset = 'UTF-8' }