8000 Merge branch 'master' into iot-snippets · medvedev/java-docs-samples@b670749 · GitHub
[go: up one dir, main page]
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
< E6BE /tr>
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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>

0 commit comments

Comments
 (0)
0