Merge branch 'master' into iot-snippets

GoogleCloudPlatform · Oct 9, 2017 · b670749 · b670749
2 parents 30b57d1 + 6637e6b
commit b670749
Show file tree

Hide file tree

Showing 82 changed files with 2,295 additions and 93 deletions.
diff --git a/appengine-java8/analytics/pom.xml b/appengine-java8/analytics/pom.xml
@@ -31,7 +31,7 @@
   <properties>
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
-    <appengine.sdk.version>1.9.56</appengine.sdk.version>
+    <appengine.sdk.version>1.9.57</appengine.sdk.version>
   </properties>
 
   <dependencies>

diff --git a/appengine-java8/appidentity/pom.xml b/appengine-java8/appidentity/pom.xml
@@ -30,7 +30,7 @@
   <properties>
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
-    <appengine.sdk.version>1.9.56</appengine.sdk.version>
+    <appengine.sdk.version>1.9.57</appengine.sdk.version>
   </properties>
 
   <dependencies>

diff --git a/appengine-java8/cloudsql/pom.xml b/appengine-java8/cloudsql/pom.xml
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-1.0-sdk</artifactId>
-      <version>1.9.56</version>
+      <version>1.9.57</version>
     </dependency>
 
     <dependency>
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>com.google.api-client</groupId>
       <artifactId>google-api-client-appengine</artifactId>
-      <version>1.22.0</version>
+      <version>1.23.0</version>
     </dependency>
 
     <!-- [START dependencies] -->

diff --git a/appengine-java8/endpoints-v2-backend/pom.xml b/appengine-java8/endpoints-v2-backend/pom.xml
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>com.google.appengine</groupId>
             <artifactId>appengine-api-1.0-sdk</artifactId>
-            <version>1.9.56</version>
+            <version>1.9.57</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>

diff --git a/appengine-java8/endpoints-v2-guice/pom.xml b/appengine-java8/endpoints-v2-guice/pom.xml
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>com.google.appengine</groupId>
             <artifactId>appengine-api-1.0-sdk</artifactId>
-            <version>1.9.56</version>
+            <version>1.9.57</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>

diff --git a/appengine-java8/endpoints-v2-migration/pom.xml b/appengine-java8/endpoints-v2-migration/pom.xml
@@ -47,7 +47,7 @@ limitations under the License.
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-1.0-sdk</artifactId>
-      <version>1.9.56</version>
+      <version>1.9.57</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

diff --git a/appengine-java8/firebase-tictactoe/pom.xml b/appengine-java8/firebase-tictactoe/pom.xml
@@ -32,7 +32,7 @@
 
       <gson.version>2.7</gson.version>
       <guava.version>20.0</guava.version>
-      <google-api-client.version>1.22.0</google-api-client.version>
+      <google-api-client.version>1.23.0</google-api-client.version>
       <junit.version>4.12</junit.version>
       <mockito.version>1.10.19</mockito.version>
       <google-truth.version>0.36</google-truth.version>

diff --git a/appengine-java8/gaeinfo/pom.xml b/appengine-java8/gaeinfo/pom.xml
@@ -65,7 +65,7 @@ Copyright 2017 Google Inc.
     <dependency>
       <groupId>org.thymeleaf</groupId>
       <artifactId>thymeleaf</artifactId>
-      <version>3.0.7.RELEASE</version>
+      <version>3.0.8.RELEASE</version>
     </dependency>
 
   </dependencies>

diff --git a/appengine-java8/guestbook-cloud-datastore/pom.xml b/appengine-java8/guestbook-cloud-datastore/pom.xml
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud</artifactId>
-      <version>0.24.0-alpha</version>
+      <version>0.25.0-alpha</version>
     </dependency>
 
     <dependency>

diff --git a/appengine-java8/images/pom.xml b/appengine-java8/images/pom.xml
@@ -21,7 +21,7 @@ Copyright 2015 Google Inc.
   <artifactId>appengine-images-j8</artifactId>
 
   <properties>
-      <appengine.sdk.version>1.9.56</appengine.sdk.version>
+      <appengine.sdk.version>1.9.57</appengine.sdk.version>
   </properties>
 
   <parent>

diff --git a/appengine-java8/metadata/pom.xml b/appengine-java8/metadata/pom.xml
@@ -60,7 +60,7 @@ Copyright 2017 Google Inc.
     <dependency>
       <groupId>org.thymeleaf</groupId>
       <artifactId>thymeleaf</artifactId>
-      <version>3.0.7.RELEASE</version>
+      <version>3.0.8.RELEASE</version>
     </dependency>
 
   </dependencies>

diff --git a/appengine-java8/postgres/pom.xml b/appengine-java8/postgres/pom.xml
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-1.0-sdk</artifactId>
-      <version>1.9.56</version>
+      <version>1.9.57</version>
     </dependency>
 
     <dependency>
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>com.google.api-client</groupId>
       <artifactId>google-api-client-appengine</artifactId>
-      <version>1.22.0</version>
+      <version>1.23.0</version>
     </dependency>
 
     <!-- [START dependencies] -->

diff --git a/appengine-java8/pubsub/pom.xml b/appengine-java8/pubsub/pom.xml
@@ -49,12 +49,12 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-pubsub</artifactId>
-      <version>0.24.0-beta</version>
+      <version>0.25.0-beta</version>
     </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-datastore</artifactId>
-      <version>1.6.0</version>
+      <version>1.7.0</version>
     </dependency>
     <!-- [END dependencies] -->
   </dependencies>

diff --git a/appengine-java8/pubsub/src/main/webapp/index.jsp b/appengine-java8/pubsub/src/main/webapp/index.jsp
@@ -1,4 +1,4 @@
-<%@ page import="com.example.flexible.pubsub.PubSubHome" %>
+<%@ page import="com.example.appengine.pubsub.PubSubHome" %>
 <html>
   <head>
     <meta http-equiv="refresh" content="10">

diff --git a/appengine-java8/spanner/pom.xml b/appengine-java8/spanner/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner</artifactId>
-      <version>0.24.0-beta</version>
+      <version>0.25.0-beta</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-1.0-sdk</artifactId>
-      <version>1.9.56</version>
+      <version>1.9.57</version>
     </dependency>
   </dependencies>
 

diff --git a/appengine-java8/taskqueues-deferred/pom.xml b/appengine-java8/taskqueues-deferred/pom.xml
@@ -31,7 +31,7 @@
   <properties>
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
-    <appengine.sdk.version>1.9.56</appengine.sdk.version> <!-- TODO: MOVE TO /appengine -->
+    <appengine.sdk.version>1.9.57</appengine.sdk.version> <!-- TODO: MOVE TO /appengine -->
   </properties>
 
   <dependencies>

diff --git a/appengine/appidentity/pom.xml b/appengine/appidentity/pom.xml
@@ -28,7 +28,7 @@
   </parent>
 
   <properties>
-    <appengine.sdk.version>1.9.56</appengine.sdk.version>
+    <appengine.sdk.version>1.9.57</appengine.sdk.version>
   </properties>
 
   <dependencies>

diff --git a/appengine/cloudsql/pom.xml b/appengine/cloudsql/pom.xml
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>com.google.api-client</groupId>
       <artifactId>google-api-client-appengine</artifactId>
-      <version>1.22.0</version>
+      <version>1.23.0</version>
     </dependency>
 
 

diff --git a/appengine/endpoints-frameworks-v2/backend/pom.xml b/appengine/endpoints-frameworks-v2/backend/pom.xml
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>com.google.appengine</groupId>
             <artifactId>appengine-api-1.0-sdk</artifactId>
-            <version>1.9.56</version>
+            <version>1.9.57</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>

diff --git a/appengine/endpoints-frameworks-v2/guice-example/pom.xml b/appengine/endpoints-frameworks-v2/guice-example/pom.xml
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>com.google.appengine</groupId>
             <artifactId>appengine-api-1.0-sdk</artifactId>
-            <version>1.9.56</version>
+            <version>1.9.57</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>

diff --git a/appengine/endpoints-frameworks-v2/migration-example/pom.xml b/appengine/endpoints-frameworks-v2/migration-example/pom.xml
@@ -60,7 +60,7 @@ limitations under the License.
         <dependency>
             <groupId>com.google.appengine</groupId>
             <artifactId>appengine-api-1.0-sdk</artifactId>
-            <version>1.9.56</version>
+            <version>1.9.57</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>

diff --git a/appengine/endpoints-v1-helloworld/pom.xml b/appengine/endpoints-v1-helloworld/pom.xml
@@ -32,7 +32,7 @@
         <appengine.app.version>1</appengine.app.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <appengine.plugin.version>1.9.56</appengine.plugin.version>
+        <appengine.plugin.version>1.9.57</appengine.plugin.version>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
     </properties>

diff --git a/appengine/firebase-tictactoe/pom.xml b/appengine/firebase-tictactoe/pom.xml
@@ -34,12 +34,12 @@
        <dependency>
            <groupId>com.google.appengine</groupId>
            <artifactId>appengine-api-1.0-sdk</artifactId>
-           <version>1.9.56</version>
+           <version>1.9.57</version>
        </dependency>
        <dependency>
            <groupId>com.google.api-client</groupId>
            <artifactId>google-api-client-appengine</artifactId>
-           <version>1.22.0</version>
+           <version>1.23.0</version>
        </dependency>
        <dependency>
            <groupId>com.google.code.gson</groupId>
@@ -60,13 +60,13 @@
        <dependency>
          <groupId>com.google.appengine</groupId>
          <artifactId>appengine-api-stubs</artifactId>
-         <version>1.9.56</version>
+         <version>1.9.57</version>
          <scope>test</scope>
          </dependency>
        <dependency>
            <groupId>com.google.appengine</groupId>
            <artifactId>appengine-testing</artifactId>
-           <version>1.9.56</version>
+           <version>1.9.57</version>
        </dependency>
    </dependencies>
     <build>

diff --git a/appengine/gaeinfo/pom.xml b/appengine/gaeinfo/pom.xml
@@ -39,7 +39,7 @@ Copyright 2017 Google Inc.
       <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-1.0-sdk</artifactId>
-      <version>1.9.56</version>
+      <version>1.9.57</version>
     </dependency>
 
     <dependency>

diff --git a/appengine/images/pom.xml b/appengine/images/pom.xml
@@ -21,7 +21,7 @@ Copyright 2015 Google Inc.
   <artifactId>appengine-images</artifactId>
 
   <properties>
-      <appengine.sdk.version>1.9.56</appengine.sdk.version>
+      <appengine.sdk.version>1.9.57</appengine.sdk.version>
   </properties>
 
   <parent>

diff --git a/appengine/pom.xml b/appengine/pom.xml
@@ -30,7 +30,7 @@
     </parent>
 
     <properties>
-        <appengine.sdk.version>1.9.56</appengine.sdk.version>
+        <appengine.sdk.version>1.9.57</appengine.sdk.version>
         <appengine.app.version>1</appengine.app.version>
 
         <project.http.version>1.19.0</project.http.version>

diff --git a/appengine/pusher-chat/pom.xml b/appengine/pusher-chat/pom.xml
@@ -57,7 +57,7 @@ Copyright 2017 Google Inc.
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-1.0-sdk</artifactId>
-      <version>1.9.56</version>
+      <version>1.9.57</version>
     </dependency>
   </dependencies>
 

diff --git a/bigquery/cloud-client/pom.xml b/bigquery/cloud-client/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-bigquery</artifactId>
-      <version>0.24.0-beta</version>
+      <version>0.25.0-beta</version>
     </dependency>
     <dependency>
       <groupId>commons-cli</groupId>

diff --git a/bigquery/rest/pom.xml b/bigquery/rest/pom.xml
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>com.google.api-client</groupId>
       <artifactId>google-api-client</artifactId>
-      <version>1.22.0</version>
+      <version>1.23.0</version>
       <exclusions>
         <exclusion> <!-- exclude an old version of Guava -->
           <groupId>com.google.guava</groupId>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client</artifactId>
-      <version>1.22.0</version>
+      <version>1.23.0</version>
       <exclusions>
         <exclusion> <!-- exclude an old version of Guava -->
           <groupId>com.google.guava</groupId>
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>com.google.oauth-client</groupId>
       <artifactId>google-oauth-client</artifactId>
-      <version>1.22.0</version>
+      <version>1.23.0</version>
       <exclusions>
         <exclusion> <!-- exclude an old version of Guava -->
           <groupId>com.google.guava</groupId>

diff --git a/compute/cmdline/pom.xml b/compute/cmdline/pom.xml
@@ -75,7 +75,7 @@ limitations under the License.
     <dependency>
      <groupId>com.google.api-client</groupId>
      <artifactId>google-api-client</artifactId>
-     <version>1.22.0</version>
+     <version>1.23.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.apis</groupId>
@@ -84,7 +84,7 @@ limitations under the License.
     </dependency>
   </dependencies>
   <properties>
-    <project.compute.version>v1-rev156-1.22.0</project.compute.version>
+    <project.compute.version>v1-rev158-1.23.0</project.compute.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/datastore/cloud-client/pom.xml b/datastore/cloud-client/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-datastore</artifactId>
-      <version>1.6.0</version>
+      <version>1.7.0</version>
     </dependency>
 
     <!-- Test dependencies -->

diff --git a/datastore/pom.xml b/datastore/pom.xml
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-datastore</artifactId>
-      <version>1.6.0</version>
+      <version>1.7.0</version>
     </dependency>
 
     <!-- Test dependencies -->

diff --git a/dlp/pom.xml b/dlp/pom.xml
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-dlp</artifactId>
-      <version>0.24.0-alpha</version>
+      <version>0.25.0-alpha</version>
     </dependency>
     <!-- [END dlp_maven] -->
     <dependency>

diff --git a/errorreporting/pom.xml b/errorreporting/pom.xml
@@ -36,7 +36,7 @@ limitations under the License.
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-errorreporting</artifactId>
-      <version>0.24.0-alpha</version>
+      <version>0.25.0-alpha</version>
     </dependency>
     <!-- Test dependencies -->
     <dependency>