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'

0 commit comments

Comments
 (0)