Skip to content

Commit 48c6842

Browse files
---
yaml --- r: 18079 b: refs/heads/pubsub-ordering-keys c: 209fc2a h: refs/heads/master i: 18077: 7f67b3d 18075: 289232a 18071: ecaee3c 18063: bc75890 18047: 13d1369
1 parent 126672a commit 48c6842

4 files changed

Lines changed: 7 additions & 12 deletions

File tree

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ refs/tags/v0.72.0: a7703f2593ba312c0b2dde6fdfd4f5c764bb55ac
159159
refs/tags/v0.73.0: 21241ea8be9439cc5764c4944cdce21d34ce4f9e
160160
refs/tags/v0.74.0: 9d1f733dbbf790de7b494418523b69c4a9a57638
161161
refs/heads/ignoretest: 23c412ae07af3d0ab1caa2d44d5bc5c0ccb8b31d
162-
refs/heads/pubsub-ordering-keys: ea68410f175b64ab06ff8bd1371935d12e3ce3e9
162+
refs/heads/pubsub-ordering-keys: 209fc2a6bf942ee064851558ea4f3c495d34dcc1
163163
"refs/heads/update_mvn_badge": ae2d773814db0f71197ccf5a8612ee1d8056f8de
164164
refs/tags/v0.75.0: c3673089ae09a897c1b4cf7dfe167fe4f8ab32fb
165165
refs/tags/v0.76.0: 395b016826d3ddf9cb8b34919636df15a4dbd032

branches/pubsub-ordering-keys/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.35.1</version>
171+
<version>1.37.0</version>
172172
<type>pom</type>
173173
<scope>import</scope>
174174
</dependency>

branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-spanner/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,6 @@
116116
<dependency>
117117
<groupId>io.grpc</groupId>
118118
<artifactId>grpc-netty-shaded</artifactId>
119-
<exclusions>
120-
<exclusion>
121-
<groupId>io.opencensus</groupId>
122-
<artifactId>opencensus-api</artifactId>
123-
</exclusion>
124-
</exclusions>
125119
</dependency>
126120
<dependency>
127121
<groupId>io.grpc</groupId>

branches/pubsub-ordering-keys/google-cloud-clients/pom.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,16 +154,17 @@
154154
<site.installationModule>google-cloud-clients</site.installationModule>
155155
<bom.version>0.77.1-alpha-SNAPSHOT</bom.version><!-- {x-version-update:google-cloud-bom:current} -->
156156
<api-client.version>1.27.0</api-client.version>
157-
<gax.version>1.35.1</gax.version>
157+
<!-- make sure to keep gax version in sync with google-cloud-bom -->
158+
<gax.version>1.37.0</gax.version>
158159
<api.common.java.version>1.7.0</api.common.java.version>
159160
<google.auth.version>0.12.0</google.auth.version>
160-
<grpc.version>1.16.1</grpc.version>
161-
<nettyssl.version>2.0.7.Final</nettyssl.version>
161+
<grpc.version>1.17.1</grpc.version>
162162
<guava.version>26.0-android</guava.version>
163163
<http-client.version>1.27.0</http-client.version>
164164
<oauth-client.version>1.27.0</oauth-client.version>
165165
<protobuf.version>3.6.1</protobuf.version>
166-
<opencensus.version>0.15.0</opencensus.version>
166+
<!-- make sure to keep opencensus version in sync with grpc -->
167+
<opencensus.version>0.17.0</opencensus.version>
167168
<!-- test dependency versions -->
168169
<easymock.version>3.4</easymock.version>
169170
<objenesis.version>2.6</objenesis.version>

0 commit comments

Comments
 (0)