Skip to content

Commit 14d6931

Browse files
gguussgguuss
authored
Merge branch 'master' into speech-wordtimeoffset
2 parents 4d877a2 + f9e8abf commit 14d6931

File tree

60 files changed

+359
-181
lines changed

Some content is hidden

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

60 files changed

+359
-181
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ before_install:
4444
&& set +x && source secrets.env && set -x
4545
|| true
4646
# Cross project - GOOGLE_APPLICATION_CREDENTIALS uses cloud-docs-tests, but BQ uses G_C_P (argh!)
47-
- export GOOGLE_CLOUD_PROJECT=java-docs-samples-tests
47+
- export GOOGLE_CLOUD_PROJECT=java-docs-samples-testing
4848
# Skip the install step, since Maven will download the dependencies we need
4949
# when the test build runs.
5050
# http://stackoverflow.com/q/31945809/101923

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<version>1.0-SNAPSHOT</version>
2020
<groupId>com.example.appengine</groupId>
2121
<artifactId>appengine-firebase-tictactoe-j8</artifactId>
22+
2223
<parent>
2324
<groupId>com.google.cloud</groupId>
2425
<artifactId>appengine-java8-samples</artifactId>

‎appengine-java8/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/MoveServletTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.junit.After;
4141
import org.junit.Before;
4242
import org.junit.BeforeClass;
43+
import org.junit.Ignore;
4344
import org.junit.Test;
4445
import org.junit.runner.RunWith;
4546
import org.junit.runners.JUnit4;
@@ -147,6 +148,7 @@ public LowLevelHttpResponse execute() throws IOException {
147148
eq("PATCH"), Matchers.matches(FIREBASE_DB_URL + "/channels/[\\w-]+.json$"));
148149
}
149150

151+
@Ignore // TODO: this wasn't running, and I've turned it off.
150152
public void doPost_notMyTurn_move() throws Exception {
151153
// Insert a game
152154
Objectify ofy = ObjectifyService.ofy();

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

6565
<dependency>

‎appengine-java8/spanner/pom.xml

Lines changed: 1 addition & 1 deletion
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.20.3-beta</version>
40+
<version>0.21.0-beta</version>
4141
</dependency>
4242
<dependency>
4343
<groupId>javax.servlet</groupId>

‎bigquery/cloud-client/pom.xml

Lines changed: 1 addition & 1 deletion
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.20.3-beta</version>
40+
<version>0.21.0-beta</version>
4141
</dependency>
4242
<dependency>
4343
<groupId>commons-cli</groupId>

‎compute/cmdline/pom.xml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,14 @@ limitations under the License.
2222
<!-- Parent POM defines common plugins and properties. -->
2323
<parent>
2424
<groupId>com.google.cloud</groupId>
25-
<artifactId>doc-samples</artifactId>
25+
<artifactId>compute</artifactId>
2626
<version>1.0.0</version>
27-
<relativePath>../..</relativePath>
27+
<relativePath>..</relativePath>
2828
</parent>
2929

3030
<build>
3131
<plugins>
32-
<plugin>
33-
<artifactId>maven-compiler-plugin</artifactId>
34-
<version>3.5.1</version>
35-
<configuration>
36-
<source>1.7</source>
37-
<target>1.7</target>
38-
</configuration>
39-
</plugin>
32+
4033
<plugin>
4134
<groupId>org.codehaus.mojo</groupId>
4235
<artifactId>exec-maven-plugin</artifactId>
@@ -58,6 +51,7 @@ limitations under the License.
5851
</systemProperties>
5952
</configuration>
6053
</plugin>
54+
6155
<plugin>
6256
<groupId>org.codehaus.mojo</groupId>
6357
<artifactId>findbugs-maven-plugin</artifactId>
@@ -73,6 +67,7 @@ limitations under the License.
7367
</execution>
7468
</executions>
7569
</plugin>
70+
7671
</plugins>
7772
<finalName>${project.artifactId}-${project.version}</finalName>
7873
</build>
@@ -89,7 +84,7 @@ limitations under the License.
8984
</dependency>
9085
</dependencies>
9186
<properties>
92-
<project.compute.version>v1-rev151-1.22.0</project.compute.version>
87+
<project.compute.version>v1-rev152-1.22.0</project.compute.version>
9388
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
9489
</properties>
9590
</project>

‎compute/error-reporting/pom.xml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,36 +20,27 @@
2020
<groupId>com.example.compute</groupId>
2121
<artifactId>compute-error-reporting</artifactId>
2222

23-
<!-- TODO: Use common parent after fixing checkstyle errors.
24-
https://github.com/GoogleCloudPlatform/java-docs-samples/issues/298
2523
<parent>
26-
<artifactId>doc-samples</artifactId>
24+
<artifactId>compute</artifactId>
2725
<groupId>com.google.cloud</groupId>
2826
<version>1.0.0</version>
29-
<relativePath>../..</relativePath>
27+
<relativePath>..</relativePath>
3028
</parent>
31-
-->
32-
33-
<properties>
34-
<maven.compiler.target>1.8</maven.compiler.target>
35-
<maven.compiler.source>1.8</maven.compiler.source>
36-
<maven-assembly-plugin-version>3.0.0</maven-assembly-plugin-version>
37-
</properties>
3829

3930
<dependencies>
4031
<!-- [START dependencies] -->
4132
<dependency>
4233
<groupId>org.fluentd</groupId>
4334
<artifactId>fluent-logger</artifactId>
44-
<version>0.3.2</version>
35+
<version>0.3.3</version>
4536
</dependency>
4637
<!-- [END dependencies] -->
4738
</dependencies>
4839
<build>
4940
<plugins>
5041
<plugin>
5142
<artifactId>maven-assembly-plugin</artifactId>
52-
<version>${maven-assembly-plugin-version}</version>
43+
<version>3.0.0</version>
5344
<executions>
5445
<execution>
5546
<phase>package</phase>

‎compute/mailjet/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@
1919
<version>1.0-SNAPSHOT</version>
2020
<groupId>com.example.compute</groupId>
2121
<artifactId>compute-mailjet</artifactId>
22+
2223
<parent>
2324
<groupId>com.google.cloud</groupId>
24-
<artifactId>doc-samples</artifactId>
25+
<artifactId>compute</artifactId>
2526
<version>1.0.0</version>
26-
<relativePath>../..</relativePath>
27+
<relativePath>..</relativePath>
2728
</parent>
2829

2930
<properties>

‎compute/pom.xml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<!--
2+
Copyright 2017 Google Inc.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
-->
16+
<project>
17+
<modelVersion>4.0.0</modelVersion>
18+
<version>1.0.0</version>
19+
20+
<groupId>com.google.cloud</groupId>
21+
<artifactId>compute</artifactId>
22+
<packaging>pom</packaging>
23+
24+
<!-- Parent POM defines common plugins and properties. -->
25+
<parent>
26+
<artifactId>doc-samples</artifactId>
27+
<groupId>com.google.cloud</groupId>
28+
<version>1.0.0</version>
29+
<relativePath>..</relativePath>
30+
</parent>
31+
32+
<modules>
33+
<module>cmdline</module>
34+
<module>error-reporting</module>
35+
<module>mailjet</module>
36+
<module>sendgrid</module>
37+
</modules>
38+
39+
</project>

‎compute/sendgrid/pom.xml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,12 @@
2020
<groupId>com.example.compute</groupId>
2121
<artifactId>compute-sendgrid</artifactId>
2222

23-
<!-- TODO: Use common parent after fixing checkstyle errors.
24-
https://github.com/GoogleCloudPlatform/java-docs-samples/issues/298
2523
<parent>
26-
<artifactId>doc-samples</artifactId>
24+
<artifactId>compute</artifactId>
2725
<groupId>com.google.cloud</groupId>
2826
<version>1.0.0</version>
29-
<relativePath>../..</relativePath>
27+
<relativePath>..</relativePath>
3028
</parent>
31-
-->
32-
33-
<properties>
34-
<maven.compiler.target>1.8</maven.compiler.target>
35-
<maven.compiler.source>1.8</maven.compiler.source>
36-
<maven-assembly-plugin-version>3.0.0</maven-assembly-plugin-version>
37-
</properties>
3829

3930
<dependencies>
4031
<!-- [START dependencies] -->
@@ -49,7 +40,7 @@
4940
<plugins>
5041
<plugin>
5142
<artifactId>maven-assembly-plugin</artifactId>
52-
<version>${maven-assembly-plugin-version}</version>
43+
<version>3.0.0</version>
5344
<executions>
5445
<execution>
5546
<phase>package</phase>

‎datastore/cloud-client/pom.xml

Lines changed: 1 addition & 1 deletion
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.2.3</version>
40+
<version>1.3.0</version>
4141
</dependency>
4242

4343
<!-- Test dependencies -->

‎datastore/pom.xml

Lines changed: 1 addition & 1 deletion
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.2.3</version>
44+
<version>1.3.0</version>
4545
</dependency>
4646

4747
<!-- Test dependencies -->

‎dlp/pom.xml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,29 +37,12 @@
3737
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3838
</properties>
3939

40-
<!-- Temporary workaround for known issue : https://github.com/GoogleCloudPlatform/google-cloud-java/issues/2192 -->
41-
<dependencyManagement>
42-
<dependencies>
43-
<dependency>
44-
<groupId>com.google.auth</groupId>
45-
<artifactId>google-auth-library-credentials</artifactId>
46-
<version>${google.auth.version}</version>
47-
</dependency>
48-
<dependency>
49-
<groupId>com.google.auth</groupId>
50-
<artifactId>google-auth-library-oauth2-http</artifactId>
51-
<version>${google.auth.version}</version>
52-
</dependency>
53-
</dependencies>
54-
</dependencyManagement>
55-
<!--- End of workaround -->
56-
5740
<dependencies>
5841
<!-- [START dlp_maven] -->
5942
<dependency>
6043
<groupId>com.google.cloud</groupId>
6144
<artifactId>google-cloud-dlp</artifactId>
62-
<version>0.20.3-alpha</version>
45+
<version>0.21.0-alpha</version>
6346
</dependency>
6447
<!-- [END dlp_maven] -->
6548
<dependency>

‎dlp/src/main/java/com/example/dlp/Inspect.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515

1616
package com.example.dlp;
1717

18-
import com.google.api.gax.grpc.OperationFuture;
18+
import com.google.api.gax.rpc.OperationFuture;
1919
import com.google.cloud.ServiceOptions;
2020
import com.google.cloud.dlp.v2beta1.DlpServiceClient;
21+
import com.google.longrunning.Operation;
2122
import com.google.privacy.dlp.v2beta1.CloudStorageOptions;
2223
import com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet;
2324
import com.google.privacy.dlp.v2beta1.ContentItem;
@@ -226,7 +227,7 @@ private static void inspectGcsFile(String bucketName, String fileName,
226227
OutputStorageConfig outputConfig = OutputStorageConfig.getDefaultInstance();
227228

228229
// asynchronously submit an inspect operation
229-
OperationFuture<InspectOperationResult, InspectOperationMetadata> responseFuture =
230+
OperationFuture<InspectOperationResult, InspectOperationMetadata, Operation> responseFuture =
230231
dlpServiceClient.createInspectOperationAsync(inspectConfig, storageConfig, outputConfig);
231232

232233
// ...
@@ -291,7 +292,7 @@ private static void inspectDatastore(String projectId, String namespaceId, Strin
291292
OutputStorageConfig outputConfig = OutputStorageConfig.getDefaultInstance();
292293

293294
// asynchronously submit an inspect operation
294-
OperationFuture<InspectOperationResult, InspectOperationMetadata> responseFuture =
295+
OperationFuture<InspectOperationResult, InspectOperationMetadata, Operation> responseFuture =
295296
dlpServiceClient.createInspectOperationAsync(inspectConfig, storageConfig, outputConfig);
296297

297298
// ...

0 commit comments

Comments
 (0)