Merge branch 'master' into speech-wordtimeoffset

GoogleCloudPlatform · Jul 31, 2017 · 14d6931 · 14d6931
2 parents 4d877a2 + f9e8abf
commit 14d6931
Show file tree

Hide file tree

Showing 60 changed files with 359 additions and 181 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -44,7 +44,7 @@ before_install:
   && set +x && source secrets.env && set -x
   || true
 # Cross project - GOOGLE_APPLICATION_CREDENTIALS uses cloud-docs-tests, but BQ uses G_C_P (argh!)
-- export GOOGLE_CLOUD_PROJECT=java-docs-samples-tests
+- export GOOGLE_CLOUD_PROJECT=java-docs-samples-testing
 # Skip the install step, since Maven will download the dependencies we need
 # when the test build runs.
 # http://stackoverflow.com/q/31945809/101923

diff --git a/appengine-java8/firebase-tictactoe/pom.xml b/appengine-java8/firebase-tictactoe/pom.xml
@@ -19,6 +19,7 @@
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
   <artifactId>appengine-firebase-tictactoe-j8</artifactId>
+
   <parent>
       <groupId>com.google.cloud</groupId>
       <artifactId>appengine-java8-samples</artifactId>

diff --git a/...a8/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/MoveServletTest.java b/...a8/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/MoveServletTest.java
@@ -40,6 +40,7 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -147,6 +148,7 @@ public LowLevelHttpResponse execute() throws IOException {
         eq("PATCH"), Matchers.matches(FIREBASE_DB_URL + "/channels/[\\w-]+.json$"));
   }
 
+  @Ignore // TODO: this wasn't running, and I've turned it off.
   public void doPost_notMyTurn_move() throws Exception {
     // Insert a game
     Objectify ofy = ObjectifyService.ofy();

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.20.3-alpha</version>
+      <version>0.21.0-alpha</version>
     </dependency>
 
     <dependency>

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.20.3-beta</version>
+      <version>0.21.0-beta</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

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.20.3-beta</version>
+      <version>0.21.0-beta</version>
     </dependency>
     <dependency>
       <groupId>commons-cli</groupId>

diff --git a/compute/cmdline/pom.xml b/compute/cmdline/pom.xml
@@ -22,21 +22,14 @@ limitations under the License.
   <!-- Parent POM defines common plugins and properties. -->
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>compute</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <build>
     <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
+
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
@@ -58,6 +51,7 @@ limitations under the License.
           </systemProperties>
         </configuration>
       </plugin>
+
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
@@ -73,6 +67,7 @@ limitations under the License.
           </execution>
         </executions>
       </plugin>
+
     </plugins>
     <finalName>${project.artifactId}-${project.version}</finalName>
   </build>
@@ -89,7 +84,7 @@ limitations under the License.
     </dependency>
   </dependencies>
   <properties>
-    <project.compute.version>v1-rev151-1.22.0</project.compute.version>
+    <project.compute.version>v1-rev152-1.22.0</project.compute.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/compute/error-reporting/pom.xml b/compute/error-reporting/pom.xml
@@ -20,36 +20,27 @@
   <groupId>com.example.compute</groupId>
   <artifactId>compute-error-reporting</artifactId>
 
-  <!-- TODO: Use common parent after fixing checkstyle errors.
-       https://github.com/GoogleCloudPlatform/java-docs-samples/issues/298
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>compute</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
-  -->
-
-  <properties>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven-assembly-plugin-version>3.0.0</maven-assembly-plugin-version>
-  </properties>
 
   <dependencies>
     <!-- [START dependencies] -->
     <dependency>
       <groupId>org.fluentd</groupId>
       <artifactId>fluent-logger</artifactId>
-      <version>0.3.2</version>
+      <version>0.3.3</version>
     </dependency>
     <!-- [END dependencies] -->
   </dependencies>
   <build>
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>${maven-assembly-plugin-version}</version>
+        <version>3.0.0</version>
         <executions>
           <execution>
             <phase>package</phase>

diff --git a/compute/mailjet/pom.xml b/compute/mailjet/pom.xml
@@ -19,11 +19,12 @@
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.compute</groupId>
   <artifactId>compute-mailjet</artifactId>
+
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>compute</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <properties>

diff --git a/compute/pom.xml b/compute/pom.xml
@@ -0,0 +1,39 @@
+<!--
+ Copyright 2017 Google Inc.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <version>1.0.0</version>
+
+  <groupId>com.google.cloud</groupId>
+  <artifactId>compute</artifactId>
+  <packaging>pom</packaging>
+
+  <!-- Parent POM defines common plugins and properties. -->
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>..</relativePath>
+  </parent>
+
+  <modules>
+    <module>cmdline</module>
+    <module>error-reporting</module>
+    <module>mailjet</module>
+    <module>sendgrid</module>
+  </modules>
+
+</project>
diff --git a/compute/sendgrid/pom.xml b/compute/sendgrid/pom.xml
@@ -20,21 +20,12 @@
   <groupId>com.example.compute</groupId>
   <artifactId>compute-sendgrid</artifactId>
 
-  <!-- TODO: Use common parent after fixing checkstyle errors.
-       https://github.com/GoogleCloudPlatform/java-docs-samples/issues/298
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>compute</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
-  -->
-
-  <properties>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven-assembly-plugin-version>3.0.0</maven-assembly-plugin-version>
-  </properties>
 
   <dependencies>
     <!-- [START dependencies] -->
@@ -49,7 +40,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>${maven-assembly-plugin-version}</version>
+        <version>3.0.0</version>
         <executions>
           <execution>
             <phase>package</phase>

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.2.3</version>
+      <version>1.3.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.2.3</version>
+      <version>1.3.0</version>
     </dependency>
 
     <!-- Test dependencies -->

diff --git a/dlp/pom.xml b/dlp/pom.xml
@@ -37,29 +37,12 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
-  <!-- Temporary workaround for known issue : https://github.com/GoogleCloudPlatform/google-cloud-java/issues/2192 -->
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>com.google.auth</groupId>
-        <artifactId>google-auth-library-credentials</artifactId>
-        <version>${google.auth.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.auth</groupId>
-        <artifactId>google-auth-library-oauth2-http</artifactId>
-        <version>${google.auth.version}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <!--- End of workaround -->
-
   <dependencies>
     <!-- [START dlp_maven] -->
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-dlp</artifactId>
-      <version>0.20.3-alpha</version>
+      <version>0.21.0-alpha</version>
     </dependency>
     <!-- [END dlp_maven] -->
     <dependency>

diff --git a/dlp/src/main/java/com/example/dlp/Inspect.java b/dlp/src/main/java/com/example/dlp/Inspect.java
@@ -15,9 +15,10 @@
 
 package com.example.dlp;
 
-import com.google.api.gax.grpc.OperationFuture;
+import com.google.api.gax.rpc.OperationFuture;
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.dlp.v2beta1.DlpServiceClient;
+import com.google.longrunning.Operation;
 import com.google.privacy.dlp.v2beta1.CloudStorageOptions;
 import com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet;
 import com.google.privacy.dlp.v2beta1.ContentItem;
@@ -226,7 +227,7 @@ private static void inspectGcsFile(String bucketName, String fileName,
       OutputStorageConfig outputConfig = OutputStorageConfig.getDefaultInstance();
 
       // asynchronously submit an inspect operation
-      OperationFuture<InspectOperationResult, InspectOperationMetadata> responseFuture =
+      OperationFuture<InspectOperationResult, InspectOperationMetadata, Operation> responseFuture =
           dlpServiceClient.createInspectOperationAsync(inspectConfig, storageConfig, outputConfig);
 
       // ...
@@ -291,7 +292,7 @@ private static void inspectDatastore(String projectId, String namespaceId, Strin
       OutputStorageConfig outputConfig = OutputStorageConfig.getDefaultInstance();
 
       // asynchronously submit an inspect operation
-      OperationFuture<InspectOperationResult, InspectOperationMetadata> responseFuture =
+      OperationFuture<InspectOperationResult, InspectOperationMetadata, Operation> responseFuture =
           dlpServiceClient.createInspectOperationAsync(inspectConfig, storageConfig, outputConfig);
 
       // ...