Skip to content

Commit b670749

Browse files
gguussgguuss
authored
Merge branch 'master' into iot-snippets
2 parents 30b57d1 + 6637e6b commit b670749

File tree

82 files changed

+2295
-93
lines changed

Some content is hidden

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

82 files changed

+2295
-93
lines changed

‎appengine-java8/analytics/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<properties>
3232
<maven.compiler.target>1.8</maven.compiler.target>
3333
<maven.compiler.source>1.8</maven.compiler.source>
34-
<appengine.sdk.version>1.9.56</appengine.sdk.version>
34+
<appengine.sdk.version>1.9.57</appengine.sdk.version>
3535
</properties>
3636

3737
<dependencies>

‎appengine-java8/appidentity/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<properties>
3131
<maven.compiler.target>1.8</maven.compiler.target>
3232
<maven.compiler.source>1.8</maven.compiler.source>
33-
<appengine.sdk.version>1.9.56</appengine.sdk.version>
33+
<appengine.sdk.version>1.9.57</appengine.sdk.version>
3434
</properties>
3535

3636
<dependencies>

‎appengine-java8/cloudsql/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>com.google.appengine</groupId>
5151
<artifactId>appengine-api-1.0-sdk</artifactId>
52-
<version>1.9.56</version>
52+
<version>1.9.57</version>
5353
</dependency>
5454

5555
<dependency>
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>com.google.api-client</groupId>
6565
<artifactId>google-api-client-appengine</artifactId>
66-
<version>1.22.0</version>
66+
<version>1.23.0</version>
6767
</dependency>
6868

6969
<!-- [START dependencies] -->

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<dependency>
5656
<groupId>com.google.appengine</groupId>
5757
<artifactId>appengine-api-1.0-sdk</artifactId>
58-
<version>1.9.56</version>
58+
<version>1.9.57</version>
5959
</dependency>
6060
<dependency>
6161
<groupId>javax.servlet</groupId>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>com.google.appengine</groupId>
6262
<artifactId>appengine-api-1.0-sdk</artifactId>
63-
<version>1.9.56</version>
63+
<version>1.9.57</version>
6464
</dependency>
6565
<dependency>
6666
<groupId>javax.servlet</groupId>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ limitations under the License.
4747
<dependency>
4848
<groupId>com.google.appengine</groupId>
4949
<artifactId>appengine-api-1.0-sdk</artifactId>
50-
<version>1.9.56</version>
50+
<version>1.9.57</version>
5151
</dependency>
5252
<dependency>
5353
<groupId>javax.servlet</groupId>

‎appengine-java8/firebase-tictactoe/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
<gson.version>2.7</gson.version>
3434
<guava.version>20.0</guava.version>
35-
<google-api-client.version>1.22.0</google-api-client.version>
35+
<google-api-client.version>1.23.0</google-api-client.version>
3636
<junit.version>4.12</junit.version>
3737
<mockito.version>1.10.19</mockito.version>
3838
<google-truth.version>0.36</google-truth.version>

‎appengine-java8/gaeinfo/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Copyright 2017 Google Inc.
6565
<dependency>
6666
<groupId>org.thymeleaf</groupId>
6767
<artifactId>thymeleaf</artifactId>
68-
<version>3.0.7.RELEASE</version>
68+
<version>3.0.8.RELEASE</version>
6969
</dependency>
7070

7171
</dependencies>

‎appengine-java8/guestbook-cloud-datastore/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<dependency>
6060
<groupId>com.google.cloud</groupId>
6161
<artifactId>google-cloud</artifactId>
62-
<version>0.24.0-alpha</version>
62+
<version>0.25.0-alpha</version>
6363
</dependency>
6464

6565
<dependency>

‎appengine-java8/images/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Copyright 2015 Google Inc.
2121
<artifactId>appengine-images-j8</artifactId>
2222

2323
<properties>
24-
<appengine.sdk.version>1.9.56</appengine.sdk.version>
24+
<appengine.sdk.version>1.9.57</appengine.sdk.version>
2525
</properties>
2626

2727
<parent>

‎appengine-java8/metadata/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Copyright 2017 Google Inc.
6060
<dependency>
6161
<groupId>org.thymeleaf</groupId>
6262
<artifactId>thymeleaf</artifactId>
63-
<version>3.0.7.RELEASE</version>
63+
<version>3.0.8.RELEASE</version>
6464
</dependency>
6565

6666
</dependencies>

‎appengine-java8/postgres/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>com.google.appengine</groupId>
5151
<artifactId>appengine-api-1.0-sdk</artifactId>
52-
<version>1.9.56</version>
52+
<version>1.9.57</version>
5353
</dependency>
5454

5555
<dependency>
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>com.google.api-client</groupId>
6565
<artifactId>google-api-client-appengine</artifactId>
66-
<version>1.22.0</version>
66+
<version>1.23.0</version>
6767
</dependency>
6868

6969
<!-- [START dependencies] -->

‎appengine-java8/pubsub/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@
4949
<dependency>
5050
<groupId>com.google.cloud</groupId>
5151
<artifactId>google-cloud-pubsub</artifactId>
52-
<version>0.24.0-beta</version>
52+
<version>0.25.0-beta</version>
5353
</dependency>
5454
<dependency>
5555
<groupId>com.google.cloud</groupId>
5656
<artifactId>google-cloud-datastore</artifactId>
57-
<version>1.6.0</version>
57+
<version>1.7.0</version>
5858
</dependency>
5959
<!-- [END dependencies] -->
6060
</dependencies>

‎appengine-java8/pubsub/src/main/webapp/index.jsp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<%@ page import="com.example.flexible.pubsub.PubSubHome" %>
1+
<%@ page import="com.example.appengine.pubsub.PubSubHome" %>
22
<html>
33
<head>
44
<meta http-equiv="refresh" content="10">

‎appengine-java8/spanner/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>com.google.cloud</groupId>
3939
<artifactId>google-cloud-spanner</artifactId>
40-
<version>0.24.0-beta</version>
40+
<version>0.25.0-beta</version>
4141
</dependency>
4242
<dependency>
4343
<groupId>javax.servlet</groupId>
@@ -48,7 +48,7 @@
4848
<dependency>
4949
<groupId>com.google.appengine</groupId>
5050
<artifactId>appengine-api-1.0-sdk</artifactId>
51-
<version>1.9.56</version>
51+
<version>1.9.57</version>
5252
</dependency>
5353
</dependencies>
5454

‎appengine-java8/taskqueues-deferred/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<properties>
3232
<maven.compiler.target>1.8</maven.compiler.target>
3333
<maven.compiler.source>1.8</maven.compiler.source>
34-
<appengine.sdk.version>1.9.56</appengine.sdk.version> <!-- TODO: MOVE TO /appengine -->
34+
<appengine.sdk.version>1.9.57</appengine.sdk.version> <!-- TODO: MOVE TO /appengine -->
3535
</properties>
3636

3737
<dependencies>

‎appengine/appidentity/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</parent>
2929

3030
<properties>
31-
<appengine.sdk.version>1.9.56</appengine.sdk.version>
31+
<appengine.sdk.version>1.9.57</appengine.sdk.version>
3232
</properties>
3333

3434
<dependencies>

‎appengine/cloudsql/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<dependency>
6565
<groupId>com.google.api-client</groupId>
6666
<artifactId>google-api-client-appengine</artifactId>
67-
<version>1.22.0</version>
67+
<version>1.23.0</version>
6868
</dependency>
6969

7070

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<dependency>
5656
<groupId>com.google.appengine</groupId>
5757
<artifactId>appengine-api-1.0-sdk</artifactId>
58-
<version>1.9.56</version>
58+
<version>1.9.57</version>
5959
</dependency>
6060
<dependency>
6161
<groupId>javax.servlet</groupId>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>com.google.appengine</groupId>
6262
<artifactId>appengine-api-1.0-sdk</artifactId>
63-
<version>1.9.56</version>
63+
<version>1.9.57</version>
6464
</dependency>
6565
<dependency>
6666
<groupId>javax.servlet</groupId>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ limitations under the License.
6060
<dependency>
6161
<groupId>com.google.appengine</groupId>
6262
<artifactId>appengine-api-1.0-sdk</artifactId>
63-
<version>1.9.56</version>
63+
<version>1.9.57</version>
6464
</dependency>
6565
<dependency>
6666
<groupId>javax.servlet</groupId>

‎appengine/endpoints-v1-helloworld/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<appengine.app.version>1</appengine.app.version>
3333
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3434

35-
<appengine.plugin.version>1.9.56</appengine.plugin.version>
35+
<appengine.plugin.version>1.9.57</appengine.plugin.version>
3636
<maven.compiler.source>1.7</maven.compiler.source>
3737
<maven.compiler.target>1.7</maven.compiler.target>
3838
</properties>

‎appengine/firebase-tictactoe/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
<dependency>
3535
<groupId>com.google.appengine</groupId>
3636
<artifactId>appengine-api-1.0-sdk</artifactId>
37-
<version>1.9.56</version>
37+
<version>1.9.57</version>
3838
</dependency>
3939
<dependency>
4040
<groupId>com.google.api-client</groupId>
4141
<artifactId>google-api-client-appengine</artifactId>
42-
<version>1.22.0</version>
42+
<version>1.23.0</version>
4343
</dependency>
4444
<dependency>
4545
<groupId>com.google.code.gson</groupId>
@@ -60,13 +60,13 @@
6060
<dependency>
6161
<groupId>com.google.appengine</groupId>
6262
<artifactId>appengine-api-stubs</artifactId>
63-
<version>1.9.56</version>
63+
<version>1.9.57</version>
6464
<scope>test</scope>
6565
</dependency>
6666
<dependency>
6767
<groupId>com.google.appengine</groupId>
6868
<artifactId>appengine-testing</artifactId>
69-
<version>1.9.56</version>
69+
<version>1.9.57</version>
7070
</dependency>
7171
</dependencies>
7272
<build>

‎appengine/gaeinfo/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Copyright 2017 Google Inc.
3939
<dependency>
4040
<groupId>com.google.appengine</groupId>
4141
<artifactId>appengine-api-1.0-sdk</artifactId>
42-
<version>1.9.56</version>
42+
<version>1.9.57</version>
4343
</dependency>
4444

4545
<dependency>

‎appengine/images/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Copyright 2015 Google Inc.
2121
<artifactId>appengine-images</artifactId>
2222

2323
<properties>
24-
<appengine.sdk.version>1.9.56</appengine.sdk.version>
24+
<appengine.sdk.version>1.9.57</appengine.sdk.version>
2525
</properties>
2626

2727
<parent>

‎appengine/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</parent>
3131

3232
<properties>
33-
<appengine.sdk.version>1.9.56</appengine.sdk.version>
33+
<appengine.sdk.version>1.9.57</appengine.sdk.version>
3434
<appengine.app.version>1</appengine.app.version>
3535

3636
<project.http.version>1.19.0</project.http.version>

‎appengine/pusher-chat/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Copyright 2017 Google Inc.
5757
<dependency>
5858
<groupId>com.google.appengine</groupId>
5959
<artifactId>appengine-api-1.0-sdk</artifactId>
60-
<version>1.9.56</version>
60+
<version>1.9.57</version>
6161
</dependency>
6262
</dependencies>
6363

‎bigquery/cloud-client/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>com.google.cloud</groupId>
3939
<artifactId>google-cloud-bigquery</artifactId>
40-
<version>0.24.0-beta</version>
40+
<version>0.25.0-beta</version>
4141
</dependency>
4242
<dependency>
4343
<groupId>commons-cli</groupId>

‎bigquery/rest/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>com.google.api-client</groupId>
4444
<artifactId>google-api-client</artifactId>
45-
<version>1.22.0</version>
45+
<version>1.23.0</version>
4646
<exclusions>
4747
<exclusion> <!-- exclude an old version of Guava -->
4848
<groupId>com.google.guava</groupId>
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>com.google.http-client</groupId>
5555
<artifactId>google-http-client</artifactId>
56-
<version>1.22.0</version>
56+
<version>1.23.0</version>
5757
<exclusions>
5858
<exclusion> <!-- exclude an old version of Guava -->
5959
<groupId>com.google.guava</groupId>
@@ -64,7 +64,7 @@
6464
<dependency>
6565
<groupId>com.google.oauth-client</groupId>
6666
<artifactId>google-oauth-client</artifactId>
67-
<version>1.22.0</version>
67+
<version>1.23.0</version>
6868
<exclusions>
6969
<exclusion> <!-- exclude an old version of Guava -->
7070
<groupId>com.google.guava</groupId>

‎compute/cmdline/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ limitations under the License.
7575
<dependency>
7676
<groupId>com.google.api-client</groupId>
7777
<artifactId>google-api-client</artifactId>
78-
<version>1.22.0</version>
78+
<version>1.23.0</version>
7979
</dependency>
8080
<dependency>
8181
<groupId>com.google.apis</groupId>
@@ -84,7 +84,7 @@ limitations under the License.
8484
</dependency>
8585
</dependencies>
8686
<properties>
87-
<project.compute.version>v1-rev156-1.22.0</project.compute.version>
87+
<project.compute.version>v1-rev158-1.23.0</project.compute.version>
8888
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8989
</properties>
9090
</project>

‎datastore/cloud-client/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>com.google.cloud</groupId>
3939
<artifactId>google-cloud-datastore</artifactId>
40-
<version>1.6.0</version>
40+
<version>1.7.0</version>
4141
</dependency>
4242

4343
<!-- Test dependencies -->

‎datastore/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>com.google.cloud</groupId>
4343
<artifactId>google-cloud-datastore</artifactId>
44-
<version>1.6.0</version>
44+
<version>1.7.0</version>
4545
</dependency>
4646

4747
<!-- Test dependencies -->

‎dlp/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>com.google.cloud</groupId>
4444
<artifactId>google-cloud-dlp</artifactId>
45-
<version>0.24.0-alpha</version>
45+
<version>0.25.0-alpha</version>
4646
</dependency>
4747
<!-- [END dlp_maven] -->
4848
<dependency>

‎errorreporting/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ limitations under the License.
3636
<dependency>
3737
<groupId>com.google.cloud</groupId>
3838
<artifactId>google-cloud-errorreporting</artifactId>
39-
<version>0.24.0-alpha</version>
39+
<version>0.25.0-alpha</version>
4040
</dependency>
4141
<!-- Test dependencies -->
4242
<dependency>

0 commit comments

Comments
 (0)