diff --git a/appengine-java8/endpoints-v2-backend/build.gradle b/appengine-java8/endpoints-v2-backend/build.gradle index c361d7da1b9..fa1959b5280 100644 --- a/appengine-java8/endpoints-v2-backend/build.gradle +++ b/appengine-java8/endpoints-v2-backend/build.gradle @@ -18,8 +18,10 @@ buildscript { } dependencies { - classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:+' - classpath 'com.google.cloud.tools:appengine-gradle-plugin:+' + // [START endpoints_plugin] + classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:1.0.2' + // [END endpoints_plugin] + classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.3' } } @@ -39,14 +41,17 @@ def projectId = 'YOUR_PROJECT_ID' apply plugin: 'java' apply plugin: 'war' +// [START endpoints_plugin_apply] apply plugin: 'com.google.cloud.tools.endpoints-framework-server' +// [END endpoints_plugin_apply] apply plugin: 'com.google.cloud.tools.appengine' dependencies { - // For real projects: use concrete versions here instead of the '+' to make your build consistent - compile 'com.google.endpoints:endpoints-framework:+' - compile 'com.google.endpoints:endpoints-management-control-appengine:+' - compile 'com.google.endpoints:endpoints-framework-auth:+' + compile 'com.google.endpoints:endpoints-framework:2.0.8' + // [START api_management] + compile 'com.google.endpoints:endpoints-management-control-appengine:1.0.5' + compile 'com.google.endpoints:endpoints-framework-auth:1.0.5' + // [END api_management] } endpointsServer { diff --git a/appengine-java8/endpoints-v2-backend/pom.xml b/appengine-java8/endpoints-v2-backend/pom.xml index 5dd67555412..fe877141a2f 100644 --- a/appengine-java8/endpoints-v2-backend/pom.xml +++ b/appengine-java8/endpoints-v2-backend/pom.xml @@ -100,7 +100,7 @@ com.google.cloud.tools endpoints-framework-maven-plugin - 1.0.1 + 1.0.2 ${endpoints.project.id}.appspot.com diff --git a/appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/appengine-web.xml index 320f4fa09af..e8e084eaf42 100644 --- a/appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/appengine-web.xml +++ b/appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/appengine-web.xml @@ -26,7 +26,9 @@ - + + + diff --git a/appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/web.xml b/appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/web.xml index 7270ad54bf6..0e850647fa0 100644 --- a/appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/web.xml +++ b/appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/web.xml @@ -44,6 +44,7 @@ + endpoints-api-controller com.google.api.control.extensions.appengine.GoogleAppEngineControlFilter @@ -66,4 +67,5 @@ endpoints-api-controller EndpointsServlet + diff --git a/appengine-java8/endpoints-v2-guice/build.gradle b/appengine-java8/endpoints-v2-guice/build.gradle index b9b24757509..b2946c97068 100644 --- a/appengine-java8/endpoints-v2-guice/build.gradle +++ b/appengine-java8/endpoints-v2-guice/build.gradle @@ -18,8 +18,8 @@ buildscript { } dependencies { - classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:+' - classpath 'com.google.cloud.tools:appengine-gradle-plugin:+' + classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:1.0.2' + classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.3' } } @@ -43,11 +43,10 @@ apply plugin: 'com.google.cloud.tools.endpoints-framework-server' apply plugin: 'com.google.cloud.tools.appengine' dependencies { - // For real projects: use concrete versions here instead of the '+' to make your build consistent - compile 'com.google.endpoints:endpoints-framework:+' - compile 'com.google.endpoints:endpoints-framework-guice:+' - compile 'com.google.endpoints:endpoints-management-control-appengine:+' - compile 'com.google.endpoints:endpoints-framework-auth:+' + compile 'com.google.endpoints:endpoints-framework:2.0.8' + compile 'com.google.endpoints:endpoints-framework-guice:' + compile 'com.google.endpoints:endpoints-management-control-appengine:1.0.5' + compile 'com.google.endpoints:endpoints-framework-auth:1.0.5' } endpointsServer { diff --git a/appengine-java8/endpoints-v2-guice/pom.xml b/appengine-java8/endpoints-v2-guice/pom.xml index 720b60a5134..5d7a170cafa 100644 --- a/appengine-java8/endpoints-v2-guice/pom.xml +++ b/appengine-java8/endpoints-v2-guice/pom.xml @@ -105,7 +105,7 @@ com.google.cloud.tools endpoints-framework-maven-plugin - 1.0.1 + 1.0.2 ${endpoints.project.id}.appspot.com diff --git a/appengine-java8/endpoints-v2-migration/build.gradle b/appengine-java8/endpoints-v2-migration/build.gradle index e8794a10144..e15924423c3 100644 --- a/appengine-java8/endpoints-v2-migration/build.gradle +++ b/appengine-java8/endpoints-v2-migration/build.gradle @@ -20,10 +20,10 @@ buildscript { // Configuration for building } dependencies { // App Engine Gradle plugin - classpath 'com.google.cloud.tools:appengine-gradle-plugin:+' + classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.0.2' // Endpoints Frameworks Gradle plugin - classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:+' + classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:1.3.3' } } // [END buildscript] @@ -50,7 +50,7 @@ dependencies { compile group: 'javax.inject', name: 'javax.inject', version: '1' // [START endpoints-tools] - compile group: 'com.google.endpoints', name: 'endpoints-framework-tools', version: '+' + compile group: 'com.google.endpoints', name: 'endpoints-framework-tools', version: '2.0.8' // [END endpoints-tools] } diff --git a/appengine-java8/endpoints-v2-migration/pom.xml b/appengine-java8/endpoints-v2-migration/pom.xml index 6710c259879..9f0a6d4c08e 100644 --- a/appengine-java8/endpoints-v2-migration/pom.xml +++ b/appengine-java8/endpoints-v2-migration/pom.xml @@ -81,7 +81,7 @@ limitations under the License. com.google.cloud.tools endpoints-framework-maven-plugin - 1.0.0-beta4 + 1.0.2 YOUR-PROJECT-ID.appspot.com diff --git a/appengine/endpoints-frameworks-v2/backend/build.gradle b/appengine/endpoints-frameworks-v2/backend/build.gradle index cef30ec9807..9bfc55b80d5 100644 --- a/appengine/endpoints-frameworks-v2/backend/build.gradle +++ b/appengine/endpoints-frameworks-v2/backend/build.gradle @@ -18,8 +18,10 @@ buildscript { } dependencies { - classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:+' - classpath 'com.google.cloud.tools:appengine-gradle-plugin:+' + // [START endpoints_plugin] + classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:1.0.2' + // [END endpoints_plugin] + classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.3' } } @@ -39,20 +41,25 @@ def projectId = 'YOUR_PROJECT_ID' apply plugin: 'java' apply plugin: 'war' +// [START endpoints_plugin_apply] apply plugin: 'com.google.cloud.tools.endpoints-framework-server' +// [END endpoints_plugin_apply] apply plugin: 'com.google.cloud.tools.appengine' dependencies { - // For real projects: use concrete versions here instead of the '+' to make your build consistent - compile 'com.google.endpoints:endpoints-framework:+' - compile 'com.google.endpoints:endpoints-management-control-appengine:+' - compile 'com.google.endpoints:endpoints-framework-auth:+' + compile 'com.google.endpoints:endpoints-framework:2.0.8' + // [START api_management] + compile 'com.google.endpoints:endpoints-management-control-appengine:1.0.5' + compile 'com.google.endpoints:endpoints-framework-auth:1.0.5' + // [END api_management] } +// [START endpoints_plugin_config] endpointsServer { // Endpoints Framework Plugin server-side configuration hostname = "${projectId}.appspot.com" } +// [END endpoints_plugin_config] appengine { // App Engine tasks configuration deploy { // deploy configuration diff --git a/appengine/endpoints-frameworks-v2/backend/pom.xml b/appengine/endpoints-frameworks-v2/backend/pom.xml index 4e70468a443..c8a31b26cff 100644 --- a/appengine/endpoints-frameworks-v2/backend/pom.xml +++ b/appengine/endpoints-frameworks-v2/backend/pom.xml @@ -32,7 +32,6 @@ UTF-8 2.0.8 - 1.0.4 YOUR_PROJECT_ID 1.7 @@ -47,11 +46,18 @@ endpoints-framework ${endpoints.framework.version} + com.google.endpoints - endpoints-management-control-appengine-all + endpoints-management-control-appengine 1.0.5 + + com.google.endpoints + endpoints-framework-auth + 1.0.5 + + com.google.appengine appengine-api-1.0-sdk @@ -82,15 +88,17 @@ + com.google.cloud.tools endpoints-framework-maven-plugin - 1.0.1 + 1.0.2 ${endpoints.project.id}.appspot.com + org.apache.maven.plugins maven-war-plugin diff --git a/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/appengine-web.xml index beabaaa425a..52cf453888b 100644 --- a/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/appengine-web.xml +++ b/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/appengine-web.xml @@ -25,7 +25,9 @@ - + + + diff --git a/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/web.xml b/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/web.xml index 3535fc6b421..2213887ec1a 100644 --- a/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/web.xml +++ b/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/web.xml @@ -40,6 +40,7 @@ + endpoints-api-controller com.google.api.control.extensions.appengine.GoogleAppEngineControlFilter @@ -62,4 +63,5 @@ endpoints-api-controller EndpointsServlet + diff --git a/appengine/endpoints-frameworks-v2/guice-example/build.gradle b/appengine/endpoints-frameworks-v2/guice-example/build.gradle index e01cd76faba..16bb2ffc8ea 100644 --- a/appengine/endpoints-frameworks-v2/guice-example/build.gradle +++ b/appengine/endpoints-frameworks-v2/guice-example/build.gradle @@ -44,10 +44,10 @@ apply plugin: 'com.google.cloud.tools.appengine' dependencies { // For real projects: use concrete versions here instead of the '+' to make your build consistent - compile 'com.google.endpoints:endpoints-framework:+' - compile 'com.google.endpoints:endpoints-framework-guice:+' - compile 'com.google.endpoints:endpoints-management-control-appengine:+' - compile 'com.google.endpoints:endpoints-framework-auth:+' + compile 'com.google.endpoints:endpoints-framework:2.0.8' + compile 'com.google.endpoints:endpoints-framework-guice:2.0.8' + compile 'com.google.endpoints:endpoints-management-control-appengine:1.0.5' + compile 'com.google.endpoints:endpoints-framework-auth:1.0.5' } endpointsServer { diff --git a/appengine/endpoints-frameworks-v2/guice-example/pom.xml b/appengine/endpoints-frameworks-v2/guice-example/pom.xml index 19036e913ea..92a96a5e920 100644 --- a/appengine/endpoints-frameworks-v2/guice-example/pom.xml +++ b/appengine/endpoints-frameworks-v2/guice-example/pom.xml @@ -32,7 +32,6 @@ UTF-8 2.0.8 - 1.0.4 YOUR_PROJECT_ID 1.7 @@ -90,7 +89,7 @@ com.google.cloud.tools endpoints-framework-maven-plugin - 1.0.1 + 1.0.2 ${endpoints.project.id}.appspot.com diff --git a/appengine/endpoints-frameworks-v2/migration-example/build.gradle b/appengine/endpoints-frameworks-v2/migration-example/build.gradle index 4497fbc591c..e6947fef393 100644 --- a/appengine/endpoints-frameworks-v2/migration-example/build.gradle +++ b/appengine/endpoints-frameworks-v2/migration-example/build.gradle @@ -20,10 +20,10 @@ buildscript { // Configuration for building } dependencies { // App Engine Gradle plugin - classpath 'com.google.cloud.tools:appengine-gradle-plugin:+' + classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.0.2' // Endpoints Frameworks Gradle plugin - classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:+' + classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:1.3.3' } } // [END buildscript] @@ -56,7 +56,7 @@ dependencies { // Endpoints Frameworks v2.0 // [START endpoints-tools] - compile group: 'com.google.endpoints', name: 'endpoints-framework', version: '+' + compile group: 'com.google.endpoints', name: 'endpoints-framework', version: '2.0.8' // [END endpoints-tools] // End of Endpoints Frameworks v2.0 } diff --git a/appengine/endpoints-frameworks-v2/migration-example/pom.xml b/appengine/endpoints-frameworks-v2/migration-example/pom.xml index 73b84ebc278..6d10e43d99b 100644 --- a/appengine/endpoints-frameworks-v2/migration-example/pom.xml +++ b/appengine/endpoints-frameworks-v2/migration-example/pom.xml @@ -93,7 +93,7 @@ limitations under the License. com.google.cloud.tools endpoints-framework-maven-plugin - 1.0.0 + 1.0.2 YOUR-PROJECT-ID.appspot.com