Skip to content

Commit 50371cc

Browse files
frankynfrankyn
authored
Merge pull request #892 from GoogleCloudPlatform/endpoints-region-tags
[Endpoints] Add region tags and update dependencies
2 parents 0ab44c6 + 72727f8 commit 50371cc

File tree

16 files changed

+66
-40
lines changed

16 files changed

+66
-40
lines changed

‎appengine-java8/endpoints-v2-backend/build.gradle

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ buildscript {
1818
}
1919

2020
dependencies {
21-
classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:+'
22-
classpath 'com.google.cloud.tools:appengine-gradle-plugin:+'
21+
// [START endpoints_plugin]
22+
classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:1.0.2'
23+
// [END endpoints_plugin]
24+
classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.3'
2325
}
2426
}
2527

@@ -39,14 +41,17 @@ def projectId = 'YOUR_PROJECT_ID'
3941

4042
apply plugin: 'java'
4143
apply plugin: 'war'
44+
// [START endpoints_plugin_apply]
4245
apply plugin: 'com.google.cloud.tools.endpoints-framework-server'
46+
// [END endpoints_plugin_apply]
4347
apply plugin: 'com.google.cloud.tools.appengine'
4448

4549
dependencies {
46-
// For real projects: use concrete versions here instead of the '+' to make your build consistent
47-
compile 'com.google.endpoints:endpoints-framework:+'
48-
compile 'com.google.endpoints:endpoints-management-control-appengine:+'
49-
compile 'com.google.endpoints:endpoints-framework-auth:+'
50+
compile 'com.google.endpoints:endpoints-framework:2.0.8'
51+
// [START api_management]
52+
compile 'com.google.endpoints:endpoints-management-control-appengine:1.0.5'
53+
compile 'com.google.endpoints:endpoints-framework-auth:1.0.5'
54+
// [END api_management]
5055
}
5156

5257
endpointsServer {

‎appengine-java8/endpoints-v2-backend/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
<plugin>
101101
<groupId>com.google.cloud.tools</groupId>
102102
<artifactId>endpoints-framework-maven-plugin</artifactId>
103-
<version>1.0.1</version>
103+
<version>1.0.2</version>
104104
<configuration>
105105
<!-- plugin configuration -->
106106
<hostname>${endpoints.project.id}.appspot.com</hostname>

‎appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/appengine-web.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
<property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
2727
</system-properties>
2828

29-
<env-variables>
29+
<!-- [START env_variables] -->
30+
<env-variables>
3031
<env-var name="ENDPOINTS_SERVICE_NAME" value="${endpoints.project.id}.appspot.com" />
3132
</env-variables>
33+
<!-- [END env_variables] -->
3234
</appengine-web-app>

‎appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/web.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
</filter>
4545

4646
<!-- Add a filter that performs Endpoints logging and monitoring. -->
47+
<!-- [START api_management] -->
4748
<filter>
4849
<filter-name>endpoints-api-controller</filter-name>
4950
<filter-class>com.google.api.control.extensions.appengine.GoogleAppEngineControlFilter</filter-class>
@@ -66,4 +67,5 @@
6667
<filter-name>endpoints-api-controller</filter-name>
6768
<servlet-name>EndpointsServlet</servlet-name>
6869
</filter-mapping>
70+
<!-- [END api_management] -->
6971
</web-app>

‎appengine-java8/endpoints-v2-guice/build.gradle

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ buildscript {
1818
}
1919

2020
dependencies {
21-
classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:+'
22-
classpath 'com.google.cloud.tools:appengine-gradle-plugin:+'
21+
classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:1.0.2'
22+
classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.3'
2323
}
2424
}
2525

@@ -43,11 +43,10 @@ apply plugin: 'com.google.cloud.tools.endpoints-framework-server'
4343
apply plugin: 'com.google.cloud.tools.appengine'
4444

4545
dependencies {
46-
// For real projects: use concrete versions here instead of the '+' to make your build consistent
47-
compile 'com.google.endpoints:endpoints-framework:+'
48-
compile 'com.google.endpoints:endpoints-framework-guice:+'
49-
compile 'com.google.endpoints:endpoints-management-control-appengine:+'
50-
compile 'com.google.endpoints:endpoints-framework-auth:+'
46+
compile 'com.google.endpoints:endpoints-framework:2.0.8'
47+
compile 'com.google.endpoints:endpoints-framework-guice:'
48+
compile 'com.google.endpoints:endpoints-management-control-appengine:1.0.5'
49+
compile 'com.google.endpoints:endpoints-framework-auth:1.0.5'
5150
}
5251

5352
endpointsServer {

‎appengine-java8/endpoints-v2-guice/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<plugin>
106106
<groupId>com.google.cloud.tools</groupId>
107107
<artifactId>endpoints-framework-maven-plugin</artifactId>
108-
<version>1.0.1</version>
108+
<version>1.0.2</version>
109109
<configuration>
110110
<!-- plugin configuration -->
111111
<hostname>${endpoints.project.id}.appspot.com</hostname>

‎appengine-java8/endpoints-v2-migration/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ buildscript { // Configuration for building
2020
}
2121
dependencies {
2222
// App Engine Gradle plugin
23-
classpath 'com.google.cloud.tools:appengine-gradle-plugin:+'
23+
classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.0.2'
2424

2525
// Endpoints Frameworks Gradle plugin
26-
classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:+'
26+
classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:1.3.3'
2727
}
2828
}
2929
// [END buildscript]
@@ -50,7 +50,7 @@ dependencies {
5050
compile group: 'javax.inject', name: 'javax.inject', version: '1'
5151

5252
// [START endpoints-tools]
53-
compile group: 'com.google.endpoints', name: 'endpoints-framework-tools', version: '+'
53+
compile group: 'com.google.endpoints', name: 'endpoints-framework-tools', version: '2.0.8'
5454
// [END endpoints-tools]
5555
}
5656

‎appengine-java8/endpoints-v2-migration/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ limitations under the License.
8181
<plugin>
8282
<groupId>com.google.cloud.tools</groupId>
8383
<artifactId>endpoints-framework-maven-plugin</artifactId>
84-
<version>1.0.0-beta4</version>
84+
<version>1.0.2</version>
8585
<configuration>
8686
<!-- plugin configuration -->
8787
<hostname>YOUR-PROJECT-ID.appspot.com</hostname>

‎appengine/endpoints-frameworks-v2/backend/build.gradle

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ buildscript {
1818
}
1919

2020
dependencies {
21-
classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:+'
22-
classpath 'com.google.cloud.tools:appengine-gradle-plugin:+'
21+
// [START endpoints_plugin]
22+
classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:1.0.2'
23+
// [END endpoints_plugin]
24+
classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.3'
2325
}
2426
}
2527

@@ -39,20 +41,25 @@ def projectId = 'YOUR_PROJECT_ID'
3941

4042
apply plugin: 'java'
4143
apply plugin: 'war'
44+
// [START endpoints_plugin_apply]
4245
apply plugin: 'com.google.cloud.tools.endpoints-framework-server'
46+
// [END endpoints_plugin_apply]
4347
apply plugin: 'com.google.cloud.tools.appengine'
4448

4549
dependencies {
46-
// For real projects: use concrete versions here instead of the '+' to make your build consistent
47-
compile 'com.google.endpoints:endpoints-framework:+'
48-
compile 'com.google.endpoints:endpoints-management-control-appengine:+'
49-
compile 'com.google.endpoints:endpoints-framework-auth:+'
50+
compile 'com.google.endpoints:endpoints-framework:2.0.8'
51+
// [START api_management]
52+
compile 'com.google.endpoints:endpoints-management-control-appengine:1.0.5'
53+
compile 'com.google.endpoints:endpoints-framework-auth:1.0.5'
54+
// [END api_management]
5055
}
5156

57+
// [START endpoints_plugin_config]
5258
endpointsServer {
5359
// Endpoints Framework Plugin server-side configuration
5460
hostname = "${projectId}.appspot.com"
5561
}
62+
// [END endpoints_plugin_config]
5663

5764
appengine { // App Engine tasks configuration
5865
deploy { // deploy configuration

‎appengine/endpoints-frameworks-v2/backend/pom.xml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3333

3434
<endpoints.framework.version>2.0.8</endpoints.framework.version>
35-
<endpoints.management.version>1.0.4</endpoints.management.version>
3635

3736
<endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>
3837
<maven.compiler.target>1.7</maven.compiler.target>
@@ -47,11 +46,18 @@
4746
<artifactId>endpoints-framework</artifactId>
4847
<version>${endpoints.framework.version}</version>
4948
</dependency>
49+
<!-- [START api_management] -->
5050
<dependency>
5151
<groupId>com.google.endpoints</groupId>
52-
<artifactId>endpoints-management-control-appengine-all</artifactId>
52+
<artifactId>endpoints-management-control-appengine</artifactId>
5353
<version>1.0.5</version>
5454
</dependency>
55+
<dependency>
56+
<groupId>com.google.endpoints</groupId>
57+
<artifactId>endpoints-framework-auth</artifactId>
58+
<version>1.0.5</version>
59+
</dependency>
60+
<!-- [END api_management] -->
5561
<dependency>
5662
<groupId>com.google.appengine</groupId>
5763
<artifactId>appengine-api-1.0-sdk</artifactId>
@@ -82,15 +88,17 @@
8288
<!-- deploy configuration -->
8389
</configuration>
8490
</plugin>
91+
<!-- [START endpoints_plugin] -->
8592
<plugin>
8693
<groupId>com.google.cloud.tools</groupId>
8794
<artifactId>endpoints-framework-maven-plugin</artifactId>
88-
<version>1.0.1</version>
95+
<version>1.0.2</version>
8996
<configuration>
9097
<!-- plugin configuration -->
9198
<hostname>${endpoints.project.id}.appspot.com</hostname>
9299
</configuration>
93100
</plugin>
101+
<!-- [END endpoints_plugin] -->
94102
<plugin>
95103
<groupId>org.apache.maven.plugins</groupId>
96104
<artifactId>maven-war-plugin</artifactId>

‎appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/appengine-web.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
<property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
2626
</system-properties>
2727

28-
<env-variables>
28+
<!-- [START env_variables] -->
29+
<env-variables>
2930
<env-var name="ENDPOINTS_SERVICE_NAME" value="${endpoints.project.id}.appspot.com" />
3031
</env-variables>
32+
<!-- [END env_variables] -->
3133
</appengine-web-app>

‎appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/web.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
</filter>
4141

4242
<!-- Add a filter that performs Endpoints logging and monitoring. -->
43+
<!-- [START api_management] -->
4344
<filter>
4445
<filter-name>endpoints-api-controller</filter-name>
4546
<filter-class>com.google.api.control.extensions.appengine.GoogleAppEngineControlFilter</filter-class>
@@ -62,4 +63,5 @@
6263
<filter-name>endpoints-api-controller</filter-name>
6364
<servlet-name>EndpointsServlet</servlet-name>
6465
</filter-mapping>
66+
<!-- [END api_management] -->
6567
</web-app>

‎appengine/endpoints-frameworks-v2/guice-example/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ apply plugin: 'com.google.cloud.tools.appengine'
4444

4545
dependencies {
4646
// For real projects: use concrete versions here instead of the '+' to make your build consistent
47-
compile 'com.google.endpoints:endpoints-framework:+'
48-
compile 'com.google.endpoints:endpoints-framework-guice:+'
49-
compile 'com.google.endpoints:endpoints-management-control-appengine:+'
50-
compile 'com.google.endpoints:endpoints-framework-auth:+'
47+
compile 'com.google.endpoints:endpoints-framework:2.0.8'
48+
compile 'com.google.endpoints:endpoints-framework-guice:2.0.8'
49+
compile 'com.google.endpoints:endpoints-management-control-appengine:1.0.5'
50+
compile 'com.google.endpoints:endpoints-framework-auth:1.0.5'
5151
}
5252

5353
endpointsServer {

‎appengine/endpoints-frameworks-v2/guice-example/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3333

3434
<endpoints.framework.version>2.0.8</endpoints.framework.version>
35-
<endpoints.management.version>1.0.4</endpoints.management.version>
3635

3736
<endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>
3837
<maven.compiler.target>1.7</maven.compiler.target>
@@ -90,7 +89,7 @@
9089
<plugin>
9190
<groupId>com.google.cloud.tools</groupId>
9291
<artifactId>endpoints-framework-maven-plugin</artifactId>
93-
<version>1.0.1</version>
92+
<version>1.0.2</version>
9493
<configuration>
9594
<!-- plugin configuration -->
9695
<hostname>${endpoints.project.id}.appspot.com</hostname>

‎appengine/endpoints-frameworks-v2/migration-example/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ buildscript { // Configuration for building
2020
}
2121
dependencies {
2222
// App Engine Gradle plugin
23-
classpath 'com.google.cloud.tools:appengine-gradle-plugin:+'
23+
classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.0.2'
2424

2525
// Endpoints Frameworks Gradle plugin
26-
classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:+'
26+
classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:1.3.3'
2727
}
2828
}
2929
// [END buildscript]
@@ -56,7 +56,7 @@ dependencies {
5656

5757
// Endpoints Frameworks v2.0
5858
// [START endpoints-tools]
59-
compile group: 'com.google.endpoints', name: 'endpoints-framework', version: '+'
59+
compile group: 'com.google.endpoints', name: 'endpoints-framework', version: '2.0.8'
6060
// [END endpoints-tools]
6161
// End of Endpoints Frameworks v2.0
6262
}

‎appengine/endpoints-frameworks-v2/migration-example/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ limitations under the License.
9393
<plugin>
9494
<groupId>com.google.cloud.tools</groupId>
9595
<artifactId>endpoints-framework-maven-plugin</artifactId>
96-
<version>1.0.0</version>
96+
<version>1.0.2</version>
9797
<configuration>
9898
<!-- plugin configuration -->
9999
<hostname>YOUR-PROJECT-ID.appspot.com</hostname>

0 commit comments

Comments
 (0)