Merge pull request #892 from GoogleCloudPlatform/endpoints-region-tags

[Endpoints] Add region tags and update dependencies
GoogleCloudPlatform · Oct 24, 2017 · 50371cc · 50371cc
2 parents 0ab44c6 + 72727f8
commit 50371cc
Show file tree

Hide file tree

Showing 16 changed files with 66 additions and 40 deletions.
diff --git 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
@@ -100,7 +100,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>endpoints-framework-maven-plugin</artifactId>
-                <version>1.0.1</version>
+                <version>1.0.2</version>
                 <configuration>
                     <!-- plugin configuration -->
                     <hostname>${endpoints.project.id}.appspot.com</hostname>

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
@@ -26,7 +26,9 @@
         <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
     </system-properties>
 
-   <env-variables>
+    <!-- [START env_variables] -->
+    <env-variables>
         <env-var name="ENDPOINTS_SERVICE_NAME" value="${endpoints.project.id}.appspot.com" />
     </env-variables>
+    <!-- [END env_variables] -->
 </appengine-web-app>
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
@@ -44,6 +44,7 @@
     </filter>
 
     <!-- Add a filter that performs Endpoints logging and monitoring. -->
+    <!-- [START api_management] -->
     <filter>
         <filter-name>endpoints-api-controller</filter-name>
         <filter-class>com.google.api.control.extensions.appengine.GoogleAppEngineControlFilter</filter-class>
@@ -66,4 +67,5 @@
         <filter-name>endpoints-api-controller</filter-name>
         <servlet-name>EndpointsServlet</servlet-name>
     </filter-mapping>
+    <!-- [END api_management] -->
 </web-app>
diff --git 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
@@ -105,7 +105,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>endpoints-framework-maven-plugin</artifactId>
-                <version>1.0.1</version>
+                <version>1.0.2</version>
                 <configuration>
                     <!-- plugin configuration -->
                     <hostname>${endpoints.project.id}.appspot.com</hostname>

diff --git 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
@@ -81,7 +81,7 @@ limitations under the License.
         <plugin>
           <groupId>com.google.cloud.tools</groupId>
           <artifactId>endpoints-framework-maven-plugin</artifactId>
-          <version>1.0.0-beta4</version>
+          <version>1.0.2</version>
           <configuration>
               <!-- plugin configuration -->
               <hostname>YOUR-PROJECT-ID.appspot.com</hostname>

diff --git 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
@@ -32,7 +32,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <endpoints.framework.version>2.0.8</endpoints.framework.version>
-        <endpoints.management.version>1.0.4</endpoints.management.version>
 
         <endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>
         <maven.compiler.target>1.7</maven.compiler.target>
@@ -47,11 +46,18 @@
             <artifactId>endpoints-framework</artifactId>
             <version>${endpoints.framework.version}</version>
         </dependency>
+        <!-- [START api_management] -->
         <dependency>
             <groupId>com.google.endpoints</groupId>
-            <artifactId>endpoints-management-control-appengine-all</artifactId>
+            <artifactId>endpoints-management-control-appengine</artifactId>
             <version>1.0.5</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.endpoints</groupId>
+            <artifactId>endpoints-framework-auth</artifactId>
+            <version>1.0.5</version>
+        </dependency>
+        <!-- [END api_management] -->
         <dependency>
             <groupId>com.google.appengine</groupId>
             <artifactId>appengine-api-1.0-sdk</artifactId>
@@ -82,15 +88,17 @@
                     <!-- deploy configuration -->
                 </configuration>
             </plugin>
+            <!-- [START endpoints_plugin] -->
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>endpoints-framework-maven-plugin</artifactId>
-                <version>1.0.1</version>
+                <version>1.0.2</version>
                 <configuration>
                     <!-- plugin configuration -->
                     <hostname>${endpoints.project.id}.appspot.com</hostname>
                 </configuration>
             </plugin>
+            <!-- [END endpoints_plugin] -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>

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
@@ -25,7 +25,9 @@
         <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
     </system-properties>
 
-   <env-variables>
+    <!-- [START env_variables] -->
+    <env-variables>
         <env-var name="ENDPOINTS_SERVICE_NAME" value="${endpoints.project.id}.appspot.com" />
     </env-variables>
+    <!-- [END env_variables] -->
 </appengine-web-app>
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
@@ -40,6 +40,7 @@
     </filter>
 
     <!-- Add a filter that performs Endpoints logging and monitoring. -->
+    <!-- [START api_management] -->
     <filter>
         <filter-name>endpoints-api-controller</filter-name>
         <filter-class>com.google.api.control.extensions.appengine.GoogleAppEngineControlFilter</filter-class>
@@ -62,4 +63,5 @@
         <filter-name>endpoints-api-controller</filter-name>
         <servlet-name>EndpointsServlet</servlet-name>
     </filter-mapping>
+    <!-- [END api_management] -->
 </web-app>
diff --git 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
@@ -32,7 +32,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <endpoints.framework.version>2.0.8</endpoints.framework.version>
-        <endpoints.management.version>1.0.4</endpoints.management.version>
 
         <endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>
         <maven.compiler.target>1.7</maven.compiler.target>
@@ -90,7 +89,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>endpoints-framework-maven-plugin</artifactId>
-                <version>1.0.1</version>
+                <version>1.0.2</version>
                 <configuration>
                     <!-- plugin configuration -->
                     <hostname>${endpoints.project.id}.appspot.com</hostname>

diff --git 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
@@ -93,7 +93,7 @@ limitations under the License.
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>endpoints-framework-maven-plugin</artifactId>
-                <version>1.0.0</version>
+                <version>1.0.2</version>
                 <configuration>
                     <!-- plugin configuration -->
                     <hostname>YOUR-PROJECT-ID.appspot.com</hostname>