Skip to content

Commit 99e520f

Browse files
kolea2kolea2
authored
---
yaml --- r: 14797 b: refs/heads/autosynth-asset c: 9cf9e1a h: refs/heads/master i: 14795: 745f708
1 parent db63d94 commit 99e520f

8 files changed

Lines changed: 18 additions & 13 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ refs/heads/autosynth-vision: b8e47d76578b5f150ef530072ea7e485e2b02ca0
122122
refs/heads/spanner: b01127f885b4611bf1852abb0ce481eeb7fcc131
123123
refs/tags/v0.68.0: 9cc799fcf68c82ab431d425fefa58ef615ce8e5b
124124
refs/tags/v0.69.0: 78f67a29e8b9c46ba01de566a2eae0fd1c03edea
125-
refs/heads/autosynth-asset: 213a56efe130ba0f81043101be137aa06b30b07f
125+
refs/heads/autosynth-asset: 9cf9e1a59b7b478a99764bdaa9e21f35c09397ae
126126
refs/heads/autosynth-automl: d4315b3596bac160e3439432c54435f44b09953e
127127
refs/heads/autosynth-bigquerydatatransfer: 2a9f3938237f85a8919602d74011326580ff387f
128128
refs/heads/autosynth-bigquerystorage: 99aee05df348f39d98b6fb23c292006f1d2a6c28

‎branches/autosynth-asset/google-cloud-bom/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
<dependency>
169169
<groupId>com.google.api</groupId>
170170
<artifactId>gax-bom</artifactId>
171-
<version>1.39.0</version>
171+
<version>1.40.0</version>
172172
<type>pom</type>
173173
<scope>import</scope>
174174
</dependency>

‎branches/autosynth-asset/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldValueListTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class FieldValueListTest {
5656
private final Map<String, String> stringPb = ImmutableMap.of("v", "string");
5757
private final Map<String, String> timestampPb = ImmutableMap.of("v", "42");
5858
private final Map<String, String> bytesPb = ImmutableMap.of("v", BYTES_BASE64);
59-
private final Map<String, Object> nullPb = ImmutableMap.of("v", Data.nullOf(String.class));
59+
private final Map<String, String> nullPb = ImmutableMap.of("v", Data.nullOf(String.class));
6060
private final Map<String, Object> repeatedPb =
6161
ImmutableMap.<String, Object>of("v", ImmutableList.<Object>of(integerPb, integerPb));
6262
private final Map<String, Object> recordPb =

‎branches/autosynth-asset/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldValueTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class FieldValueTest {
4242
private static final Map<String, String> STRING_FIELD = ImmutableMap.of("v", "string");
4343
private static final Map<String, String> TIMESTAMP_FIELD = ImmutableMap.of("v", "42");
4444
private static final Map<String, String> BYTES_FIELD = ImmutableMap.of("v", BYTES_BASE64);
45-
private static final Map<String, Object> NULL_FIELD =
45+
private static final Map<String, String> NULL_FIELD =
4646
ImmutableMap.of("v", Data.nullOf(String.class));
4747
private static final Map<String, Object> REPEATED_FIELD =
4848
ImmutableMap.<String, Object>of("v", ImmutableList.<Object>of(INTEGER_FIELD, INTEGER_FIELD));

‎branches/autosynth-asset/google-cloud-clients/google-cloud-core/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
</exclusion>
3838
</exclusions>
3939
</dependency>
40-
4140
<dependency>
4241
<groupId>com.google.code.findbugs</groupId>
4342
<artifactId>jsr305</artifactId>

‎branches/autosynth-asset/google-cloud-clients/google-cloud-storage/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
<artifactId>google-api-services-storage</artifactId>
3232
<scope>compile</scope>
3333
</dependency>
34+
<dependency>
35+
<groupId>com.google.http-client</groupId>
36+
<artifactId>google-http-client-apache</artifactId>
37+
<version>2.0.0</version>
38+
</dependency>
3439

3540
<!-- Test dependencies -->
3641
<dependency>

‎branches/autosynth-asset/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -483,10 +483,11 @@ Builder setMediaLink(String mediaLink) {
483483

484484
@Override
485485
public Builder setMetadata(Map<String, String> metadata) {
486-
this.metadata =
487-
metadata != null
488-
? new HashMap<>(metadata)
489-
: Data.<Map<String, String>>nullOf(ImmutableEmptyMap.class);
486+
if (metadata != null) {
487+
this.metadata = new HashMap<>(metadata);
488+
} else {
489+
this.metadata = (Map<String, String>) Data.nullOf(ImmutableEmptyMap.class);
490+
}
490491
return this;
491492
}
492493

‎branches/autosynth-asset/google-cloud-clients/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,14 @@
155155
<bom.version>0.80.1-alpha-SNAPSHOT</bom.version><!-- {x-version-update:google-cloud-bom:current} -->
156156
<api-client.version>1.27.0</api-client.version>
157157
<!-- make sure to keep gax version in sync with google-cloud-bom -->
158-
<gax.version>1.39.0</gax.version>
158+
<gax.version>1.40.0</gax.version>
159159
<api.common.java.version>1.7.0</api.common.java.version>
160-
<google.auth.version>0.12.0</google.auth.version>
160+
<google.auth.version>0.13.0</google.auth.version>
161161
<grpc.version>1.18.0</grpc.version>
162162
<!-- We are currently using the *-android version to support JDK7. -->
163163
<guava.version>26.0-android</guava.version>
164-
<http-client.version>1.27.0</http-client.version>
165-
<oauth-client.version>1.27.0</oauth-client.version>
164+
<http-client.version>1.28.0</http-client.version>
165+
<oauth-client.version>1.28.0</oauth-client.version>
166166
<protobuf.version>3.6.1</protobuf.version>
167167
<!-- make sure to keep opencensus version in sync with grpc -->
168168
<opencensus.version>0.18.0</opencensus.version>

0 commit comments

Comments
 (0)