Skip to content

Commit e52f4ac

Browse files
gguussgguuss
authored
Merge branch 'master' into iot-mqtt-refresh
2 parents 50f52bf + f64e4f3 commit e52f4ac

File tree

94 files changed

+549
-893
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+549
-893
lines changed

‎.circleci/config.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎.gitmodules

Whitespace-only changes.

‎.mvn/wrapper/maven-wrapper.jar

-48.4 KB
Binary file not shown.

‎.mvn/wrapper/maven-wrapper.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.travis.yml

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎appengine-java8/analytics/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<dependency>
8686
<groupId>org.mockito</groupId>
8787
<artifactId>mockito-core</artifactId>
88-
<version>2.11.0</version>
88+
<version>2.12.0</version>
8989
<scope>test</scope>
9090
</dependency>
9191
<dependency>

‎appengine-java8/bigtable/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ limitations under the License.
3131
</parent>
3232

3333
<properties>
34-
<appengine.maven.plugin>1.3.1</appengine.maven.plugin>
34+
<appengine.maven.plugin>1.3.2</appengine.maven.plugin>
3535
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3636
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3737
<maven.compiler.source>1.8</maven.compiler.source>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>
3838
<maven.compiler.target>1.8</maven.compiler.target>
3939
<maven.compiler.source>1.8</maven.compiler.source>
40-
<appengine.maven.plugin.version>1.3.1</appengine.maven.plugin.version>
40+
<appengine.maven.plugin.version>1.3.2</appengine.maven.plugin.version>
4141
</properties>
4242

4343
<dependencies>
@@ -50,7 +50,7 @@
5050
<dependency>
5151
<groupId>com.google.endpoints</groupId>
5252
<artifactId>endpoints-management-control-appengine-all</artifactId>
53-
<version>1.0.5</version>
53+
<version>1.0.6</version>
5454
</dependency>
5555
<dependency>
5656
<groupId>com.google.appengine</groupId>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>
3838
<maven.compiler.target>1.8</maven.compiler.target>
3939
<maven.compiler.source>1.8</maven.compiler.source>
40-
<appengine.maven.plugin.version>1.3.1</appengine.maven.plugin.version>
40+
<appengine.maven.plugin.version>1.3.2</appengine.maven.plugin.version>
4141
</properties>
4242

4343
<dependencies>
@@ -57,7 +57,7 @@
5757
<dependency>
5858
<groupId>com.google.endpoints</groupId>
5959
<artifactId>endpoints-management-control-appengine-all</artifactId>
60-
<version>1.0.5</version>
60+
<version>1.0.6</version>
6161
</dependency>
6262
<dependency>
6363
<groupId>com.google.appengine</groupId>

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,10 @@ repositories { // repositories for Jar's you access in your code
3636
apply plugin: 'java' // standard Java tasks
3737
apply plugin: 'war' // standard Web Archive plugin
3838

39-
// [START apply_appengine]
40-
apply plugin: 'com.google.cloud.tools.appengine' // App Engine tasks
41-
// [END apply_appengine]
42-
43-
// [START apply_endpoints-framework-server]
39+
// [START apply_plugins]
40+
apply plugin: 'com.google.cloud.tools.appengine'
4441
apply plugin: 'com.google.cloud.tools.endpoints-framework-server'
45-
// [END apply_endpoints-framework-server]
42+
// [END apply_plugins]
4643

4744
dependencies {
4845
providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version:'3.1.0'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ limitations under the License.
7171
<plugin>
7272
<groupId>com.google.cloud.tools</groupId>
7373
<artifactId>appengine-maven-plugin</artifactId>
74-
<version>1.3.1</version>
74+
<version>1.3.2</version>
7575
<configuration>
7676
<!-- deploy configuration -->
7777
</configuration>

‎appengine-java8/endpoints-v2-skeleton/README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# App Engine Standard & Endpoints Frameworks skeleton
2+
3+
This is a skeleton example for getting setup with Endpoints Framework v2 for
4+
Java.
5+
6+
For a more complete example of using Endpoints Framework v2 for Java review
7+
the [backend example](/appengine-java8/endpoints-v2-backend).

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

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
// Copyright 2017 Google Inc.
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.import org.apache.tools.ant.filters.ReplaceTokens
14+
15+
// [START build_script]
16+
buildscript {
17+
repositories {
18+
mavenCentral()
19+
}
20+
21+
dependencies {
22+
classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:1.0.2'
23+
classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.3'
24+
}
25+
}
26+
// [END build_script]
27+
28+
repositories {
29+
mavenCentral()
30+
}
31+
32+
// [START plugin_applys]
33+
apply plugin: 'java'
34+
apply plugin: 'war'
35+
apply plugin: 'com.google.cloud.tools.endpoints-framework-server'
36+
apply plugin: 'com.google.cloud.tools.appengine'
37+
// [END plugin_applys]
38+
39+
// [START dependencies]
40+
dependencies {
41+
compile 'com.google.endpoints:endpoints-framework:2.0.9'
42+
compile 'com.google.appengine:appengine-api-1.0-sdk:1.9.59'
43+
44+
compile 'javax.inject:javax.inject:1'
45+
compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
46+
}
47+
// [END dependencies]
48+
49+
// [START endpoints_server_configuration]
50+
// You must replace YOUR_PROJECT_ID with your Google Cloud Project Id
51+
def projectId = 'YOUR_PROJECT_ID'
52+
53+
endpointsServer {
54+
// Endpoints Framework Plugin server-side configuration
55+
hostname = "${projectId}.appspot.com"
56+
}
57+
// [END endpoints_server_configuration]
58+
59+
appengine { // App Engine tasks configuration
60+
deploy { // deploy configuration
61+
version = findProperty("appengine.deploy.version")
62+
63+
def promoteProp = findProperty("appengine.deploy.promote")
64+
if (promoteProp != null) {
65+
promote = new Boolean(promoteProp)
66+
}
67+
}
68+
}
69+
70+
sourceCompatibility = 1.8
71+
targetCompatibility = 1.8
72+
73+
task wrapper(type: Wrapper) {
74+
gradleVersion = '3.5'
75+
}
76+
77+
// this replaces the ${endpoints.project.id} in appengine-web.xml and web.xml
78+
task replaceProjectId(type: Copy) {
79+
from 'src/main/webapp/WEB-INF/'
80+
include '*.xml'
81+
into "build/exploded-${archivesBaseName}/WEB-INF"
82+
expand(endpoints:[project:[id:projectId]])
83+
filteringCharset = 'UTF-8'
84+
}
85+
assemble.dependsOn replaceProjectId

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

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
<!--
2+
Copyright 2017 Google Inc.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
-->
16+
<project>
17+
<modelVersion>4.0.0</modelVersion>
18+
<packaging>war</packaging>
19+
<version>1.0-SNAPSHOT</version>
20+
21+
<groupId>com.example.skeleton</groupId>
22+
<artifactId>endpoints-j8-skeleton</artifactId>
23+
24+
<parent>
25+
<artifactId>appengine-java8-samples</artifactId>
26+
<groupId>com.google.cloud</groupId>
27+
<version>1.0.0</version>
28+
<relativePath>..</relativePath>
29+
</parent>
30+
31+
<properties>
32+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
33+
34+
<maven.compiler.target>1.8</maven.compiler.target>
35+
<maven.compiler.source>1.8</maven.compiler.source>
36+
</properties>
37+
38+
<!-- [START pom_dependencies] -->
39+
<dependencies>
40+
<!-- Compile/runtime dependencies -->
41+
<dependency>
42+
<groupId>com.google.endpoints</groupId>
43+
<artifactId>endpoints-framework</artifactId>
44+
<version>2.0.9</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>com.google.appengine</groupId>
48+
<artifactId>appengine-api-1.0-sdk</artifactId>
49+
<version>1.9.59</version>
50+
</dependency>
51+
<dependency>
52+
<groupId>javax.servlet</groupId>
53+
<artifactId>javax.servlet-api</artifactId>
54+
<version>3.1.0</version>
55+
<type>jar</type>
56+
<scope>provided</scope>
57+
</dependency>
58+
<dependency>
59+
<groupId>javax.inject</groupId>
60+
<artifactId>javax.inject</artifactId>
61+
<version>1</version>
62+
</dependency>
63+
</dependencies>
64+
<!-- [END pom_dependencies] -->
65+
66+
<!-- [START pom_build] -->
67+
<build>
68+
<!-- for hot reload of the web application-->
69+
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
70+
<plugins>
71+
<plugin>
72+
<groupId>org.apache.maven.plugins</groupId>
73+
<artifactId>maven-war-plugin</artifactId>
74+
<version>2.6</version>
75+
<configuration>
76+
<webResources>
77+
<resources>
78+
<directory>${basedir}/src/main/webapp/WEB-INF</directory>
79+
<filtering>true</filtering>
80+
<targetPath>WEB-INF</targetPath>
81+
</resources>
82+
</webResources>
83+
</configuration>
84+
</plugin>
85+
<plugin>
86+
<groupId>com.google.cloud.tools</groupId>
87+
<artifactId>appengine-maven-plugin</artifactId>
88+
<version>1.3.2</version>
89+
<configuration>
90+
<!-- deploy configuration -->
91+
</configuration>
92+
</plugin>
93+
<!-- [START endpoints_maven_configuration] -->
94+
<plugin>
95+
<groupId>com.google.cloud.tools</groupId>
96+
<artifactId>endpoints-framework-maven-plugin</artifactId>
97+
<version>1.0.2</version>
98+
<configuration>
99+
<!-- plugin configuration -->
100+
<!--
101+
You must replace YOUR_PROJECT_ID with your
102+
Google Cloud Project Id
103+
-->
104+
<hostname>YOUR_PROJECT_ID.appspot.com</hostname>
105+
</configuration>
106+
</plugin>
107+
<!-- [END endpoints_maven_configuration] -->
108+
</plugins>
109+
</build>
110+
<!-- [END pom_build] -->
111+
</project>
112+
<!-- [END pom] -->

0 commit comments

Comments
 (0)