Skip to content

Commit cc41c92

Browse files
authored
Upgrade gax, grpc and guava dependencies (#3980)
* Bump gax version to 1.35.0 and guava to 26.0-android * Update grpc dependency to 1.16.1 * Add temporary, specific animal-sniffer-annotation version
1 parent fc53abd commit cc41c92

5 files changed

Lines changed: 15 additions & 19 deletions

File tree

google-api-grpc/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,13 @@
100100
<dependency>
101101
<groupId>io.grpc</groupId>
102102
<artifactId>grpc-stub</artifactId>
103-
<version>1.15.0</version>
103+
<version>1.16.1</version>
104104
<scope>compile</scope>
105105
</dependency>
106106
<dependency>
107107
<groupId>io.grpc</groupId>
108108
<artifactId>grpc-protobuf</artifactId>
109-
<version>1.15.0</version>
109+
<version>1.16.1</version>
110110
<scope>compile</scope>
111111
</dependency>
112112
<dependency>

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.34.0</version>
171+
<version>1.35.0</version>
172172
<type>pom</type>
173173
<scope>import</scope>
174174
</dependency>

google-cloud-clients/google-cloud-bigquerystorage/pom.xml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,26 +37,17 @@
3737
<dependency>
3838
<groupId>com.google.api</groupId>
3939
<artifactId>gax-grpc</artifactId>
40-
<version>1.34.0</version>
4140
<scope>test</scope>
4241
</dependency>
4342
<dependency>
4443
<groupId>com.google.api</groupId>
4544
<artifactId>gax-grpc</artifactId>
46-
<version>1.34.0</version>
4745
<classifier>testlib</classifier>
4846
<scope>test</scope>
4947
</dependency>
5048
<dependency>
5149
<groupId>com.google.api</groupId>
5250
<artifactId>gax</artifactId>
53-
<version>0.4.0</version>
54-
<scope>test</scope>
55-
</dependency>
56-
<dependency>
57-
<groupId>com.google.api</groupId>
58-
<artifactId>gax</artifactId>
59-
<version>1.34.0</version>
6051
<scope>test</scope>
6152
</dependency>
6253

@@ -69,12 +60,10 @@
6960
<dependency>
7061
<groupId>com.google.api</groupId>
7162
<artifactId>gax</artifactId>
72-
<version>1.34.0</version>
7363
</dependency>
7464
<dependency>
7565
<groupId>com.google.api</groupId>
7666
<artifactId>gax-grpc</artifactId>
77-
<version>1.34.0</version>
7867
</dependency>
7968
</dependencies>
80-
</project>
69+
</project>

google-cloud-clients/pom.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,11 @@
156156
<site.installationModule>google-cloud-clients</site.installationModule>
157157
<bom.version>0.70.1-alpha-SNAPSHOT</bom.version><!-- {x-version-update:google-cloud-bom:current} -->
158158
<api-client.version>1.27.0</api-client.version>
159-
<gax.version>1.34.0</gax.version>
159+
<gax.version>1.35.0</gax.version>
160160
<google.auth.version>0.12.0</google.auth.version>
161-
<grpc.version>1.15.0</grpc.version>
161+
<grpc.version>1.16.1</grpc.version>
162162
<nettyssl.version>2.0.7.Final</nettyssl.version>
163-
<guava.version>20.0</guava.version>
163+
<guava.version>26.0-android</guava.version>
164164
<http-client.version>1.27.0</http-client.version>
165165
<oauth-client.version>1.27.0</oauth-client.version>
166166
<protobuf.version>3.6.1</protobuf.version>
@@ -200,6 +200,13 @@
200200
<version>v1-rev20180813-1.27.0</version>
201201
</dependency>
202202

203+
<!-- TODO(chingor): Remove this when grpc and guava converge -->
204+
<dependency>
205+
<groupId>org.codehaus.mojo</groupId>
206+
<artifactId>animal-sniffer-annotations</artifactId>
207+
<version>1.17</version>
208+
</dependency>
209+
203210
<dependency>
204211
<groupId>commons-fileupload</groupId>
205212
<artifactId>commons-fileupload</artifactId>

google-cloud-testing/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<dependency>
5252
<groupId>com.google.guava</groupId>
5353
<artifactId>guava-testlib</artifactId>
54-
<version>20.0</version>
54+
<version>26.0-android</version>
5555
</dependency>
5656
<dependency>
5757
<groupId>junit</groupId>

0 commit comments

Comments
 (0)