Skip to content

Commit 91e5c04

Browse files
wshgarrettjonesgoogle
authored andcommitted
---
yaml --- r: 8927 b: refs/heads/lesv-patch-1 c: 306e82a h: refs/heads/master i: 8925: 0136802 8923: ad1e255 8919: a67b155 8911: 471b50c 8895: 95a8b8e
1 parent 4e6960c commit 91e5c04

3 files changed

Lines changed: 9 additions & 15 deletions

File tree

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ refs/tags/v0.22.0: 18b298fe4bfe8ec2f20b0e0bf7ffdcce5cc3c5fe
6666
refs/heads/vam-google-patch-1: d0c8fee3a4074d0bf7360ce8c4f7f7223d0ee7b9
6767
refs/heads/vam-google-patch-CODEOWNERS: 2ac1616e25229e51d08a984708ef1918f91a35ee
6868
refs/heads/danoscarmike-patch-1: 7342a9916bce4ed00002c7202e2a16c5d46afaea
69-
refs/heads/lesv-patch-1: b7b3f21b784a3524f7830f34148abfd3e39677d4
69+
refs/heads/lesv-patch-1: 306e82a4d006216eaa69ff1bc163238a75828f95
7070
refs/heads/ml-update-branch: 079dd6610017f5c51b9d1938c12d6d55b61513cf
7171
refs/heads/vkedia-patch-2: 7d8241388a9769a5c069334761b06c7012c878e7
7272
refs/heads/vkedia-patch-3: 4d128043acaa7db9160faf439d2ca6104e8a88cb

branches/lesv-patch-1/google-cloud-bom/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@
130130
<gax.version>1.16.0</gax.version>
131131
<gax-grpc.version>1.16.0</gax-grpc.version>
132132
<gax-httpjson.version>0.33.0</gax-httpjson.version>
133-
<generated-proto-beta.version>0.1.26</generated-proto-beta.version>
134-
<generated-proto-ga.version>1.0.2</generated-proto-ga.version>
133+
<generated-proto-beta.version>0.1.27</generated-proto-beta.version>
134+
<generated-proto-ga.version>1.0.3</generated-proto-ga.version>
135135
<google.auth.version>0.9.0</google.auth.version>
136136
<grpc.version>1.7.0</grpc.version>
137137
<nettyssl.version>2.0.6.Final</nettyssl.version>
@@ -368,14 +368,14 @@
368368
<type>test-jar</type>
369369
</dependency>
370370
<dependency>
371-
<groupId>com.google.cloud.datastore</groupId>
372-
<artifactId>datastore-v1-protos</artifactId>
373-
<version>1.5.0</version>
371+
<groupId>com.google.api.grpc</groupId>
372+
<artifactId>proto-google-cloud-datastore-v1</artifactId>
373+
<version>${generated-proto-beta.version}</version>
374374
</dependency>
375375
<dependency>
376376
<groupId>com.google.cloud.datastore</groupId>
377377
<artifactId>datastore-v1-proto-client</artifactId>
378-
<version>1.5.1</version>
378+
<version>1.6.0</version>
379379
</dependency>
380380

381381
<dependency>

branches/lesv-patch-1/google-cloud-datastore/pom.xml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,8 @@
2727
<artifactId>google-cloud-core-http</artifactId>
2828
</dependency>
2929
<dependency>
30-
<groupId>com.google.cloud.datastore</groupId>
31-
<artifactId>datastore-v1-protos</artifactId>
32-
<exclusions>
33-
<exclusion>
34-
<groupId>com.google.api.grpc</groupId>
35-
<artifactId>grpc-google-common-protos</artifactId>
36-
</exclusion>
37-
</exclusions>
30+
<groupId>com.google.api.grpc</groupId>
31+
<artifactId>proto-google-cloud-datastore-v1</artifactId>
3832
</dependency>
3933
<dependency>
4034
<groupId>com.google.cloud.datastore</groupId>

0 commit comments

Comments
 (0)