Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Endpoints] Add region tags and update dependencies #892

Merged
merged 2 commits into from
Oct 24, 2017
Merged

[Endpoints] Add region tags and update dependencies #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d5d0b1
Add region tags and update dependencies
frankyn Oct 9, 2017
72727f8
Merge branch 'master' into endpoints-region-tags
frankyn Oct 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions appengine-java8/endpoints-v2-backend/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

Expand All @@ -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'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm sure there is a reason this is lonely. (no tag) Just checking.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the dependencies below will be used in documentation for "Adding API Management" and not starting from scratch.

// [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 {
Expand Down
2 changes: 1 addition & 1 deletion appengine-java8/endpoints-v2-backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/appengine-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 2 additions & 0 deletions appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -66,4 +67,5 @@
<filter-name>endpoints-api-controller</filter-name>
<servlet-name>EndpointsServlet</servlet-name>
</filter-mapping>
<!-- [END api_management] -->
</web-app>
13 changes: 6 additions & 7 deletions appengine-java8/endpoints-v2-guice/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion appengine-java8/endpoints-v2-guice/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions appengine-java8/endpoints-v2-migration/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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]
}

Expand Down
2 changes: 1 addition & 1 deletion appengine-java8/endpoints-v2-migration/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
19 changes: 13 additions & 6 deletions appengine/endpoints-frameworks-v2/backend/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

Expand All @@ -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
Expand Down
14 changes: 11 additions & 3 deletions appengine/endpoints-frameworks-v2/backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/appengine-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 2 additions & 0 deletions appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -62,4 +63,5 @@
<filter-name>endpoints-api-controller</filter-name>
<servlet-name>EndpointsServlet</servlet-name>
</filter-mapping>
<!-- [END api_management] -->
</web-app>
8 changes: 4 additions & 4 deletions appengine/endpoints-frameworks-v2/guice-example/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions appengine/endpoints-frameworks-v2/guice-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions appengine/endpoints-frameworks-v2/migration-example/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion appengine/endpoints-frameworks-v2/migration-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down