Skip to content

Commit 05d5811

Browse files
pongadpongad
authored
bump grpc dependency to 1.2.0 (#1902)
also move various protobuf-generated dependencies to 0.1.7 update gax version to 0.10.0
1 parent eea1a58 commit 05d5811

12 files changed

Lines changed: 21 additions & 20 deletions

File tree

‎google-cloud-core/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,12 @@
114114
<dependency>
115115
<groupId>com.google.protobuf</groupId>
116116
<artifactId>protobuf-java</artifactId>
117-
<version>3.0.0</version>
117+
<version>3.2.0</version>
118118
</dependency>
119119
<dependency>
120120
<groupId>com.google.protobuf</groupId>
121121
<artifactId>protobuf-java-util</artifactId>
122-
<version>3.0.0</version>
122+
<version>3.2.0</version>
123123
</dependency>
124124
<dependency>
125125
<groupId>io.grpc</groupId>
@@ -140,7 +140,7 @@
140140
<dependency>
141141
<groupId>com.google.api.grpc</groupId>
142142
<artifactId>grpc-google-common-protos</artifactId>
143-
<version>0.1.5</version>
143+
<version>0.1.7</version>
144144
<exclusions>
145145
<exclusion>
146146
<groupId>io.grpc</groupId>
@@ -151,7 +151,7 @@
151151
<dependency>
152152
<groupId>com.google.api.grpc</groupId>
153153
<artifactId>grpc-google-iam-v1</artifactId>
154-
<version>0.1.5</version>
154+
<version>0.1.7</version>
155155
<exclusions>
156156
<exclusion>
157157
<groupId>io.grpc</groupId>

‎google-cloud-errorreporting/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.google.api.grpc</groupId>
3333
<artifactId>grpc-google-cloud-error-reporting-v1beta1</artifactId>
34-
<version>0.1.5</version>
34+
<version>0.1.7</version>
3535
<exclusions>
3636
<exclusion>
3737
<groupId>io.grpc</groupId>

‎google-cloud-language/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>com.google.api.grpc</groupId>
3434
<artifactId>grpc-google-cloud-language-v1</artifactId>
35-
<version>0.1.6</version>
35+
<version>0.1.7</version>
3636
<exclusions>
3737
<exclusion>
3838
<groupId>io.grpc</groupId>
@@ -43,7 +43,7 @@
4343
<dependency>
4444
<groupId>com.google.api.grpc</groupId>
4545
<artifactId>grpc-google-cloud-language-v1beta2</artifactId>
46-
<version>0.1.6</version>
46+
<version>0.1.7</version>
4747
<exclusions>
4848
<exclusion>
4949
<groupId>io.grpc</groupId>

‎google-cloud-logging/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>com.google.api.grpc</groupId>
3434
<artifactId>grpc-google-cloud-logging-v2</artifactId>
35-
<version>0.1.5</version>
35+
<version>0.1.7</version>
3636
<exclusions>
3737
<exclusion>
3838
<groupId>io.grpc</groupId>

‎google-cloud-monitoring/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.google.api.grpc</groupId>
3333
<artifactId>grpc-google-cloud-monitoring-v3</artifactId>
34-
<version>0.1.5</version>
34+
<version>0.1.7</version>
3535
<exclusions>
3636
<exclusion>
3737
<groupId>io.grpc</groupId>

‎google-cloud-pubsub/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.google.api.grpc</groupId>
3333
<artifactId>grpc-google-cloud-pubsub-v1</artifactId>
34-
<version>0.1.6</version>
34+
<version>0.1.7</version>
3535
<exclusions>
3636
<exclusion>
3737
<groupId>io.grpc</groupId>

‎google-cloud-spanner/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<dependency>
9999
<groupId>com.google.api.grpc</groupId>
100100
<artifactId>grpc-google-cloud-spanner-v1</artifactId>
101-
<version>0.1.5</version>
101+
<version>0.1.7</version>
102102
<exclusions>
103103
<exclusion>
104104
<groupId>io.grpc</groupId>
@@ -109,7 +109,7 @@
109109
<dependency>
110110
<groupId>com.google.api.grpc</groupId>
111111
<artifactId>grpc-google-cloud-spanner-admin-database-v1</artifactId>
112-
<version>0.1.5</version>
112+
<version>0.1.7</version>
113113
<exclusions>
114114
<exclusion>
115115
<groupId>io.grpc</groupId>
@@ -120,7 +120,7 @@
120120
<dependency>
121121
<groupId>com.google.api.grpc</groupId>
122122
<artifactId>grpc-google-cloud-spanner-admin-instance-v1</artifactId>
123-
<version>0.1.5</version>
123+
<version>0.1.7</version>
124124
<exclusions>
125125
<exclusion>
126126
<groupId>io.grpc</groupId>

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/WatchdogInterceptorTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import static org.mockito.Mockito.verify;
2626
import static org.mockito.Mockito.when;
2727

28+
import com.google.api.gax.grpc.testing.FakeMethodDescriptor;
2829
import com.google.common.testing.FakeTicker;
2930
import io.grpc.CallOptions;
3031
import io.grpc.Channel;
@@ -56,9 +57,9 @@ public class WatchdogInterceptorTest {
5657

5758
CallOptions options;
5859
Metadata metadata;
60+
MethodDescriptor<Void, Void> descriptor = FakeMethodDescriptor.create();
5961

6062
@Mock Channel channel;
61-
@Mock MethodDescriptor<Void, Void> descriptor;
6263
@Mock ClientCall<Void, Void> innerCall;
6364
@Mock ClientCall.Listener<Void> listener;
6465

‎google-cloud-speech/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.google.api.grpc</groupId>
3333
<artifactId>grpc-google-cloud-speech-v1beta1</artifactId>
34-
<version>0.1.5</version>
34+
<version>0.1.7</version>
3535
<exclusions>
3636
<exclusion>
3737
<groupId>io.grpc</groupId>
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>com.google.api.grpc</groupId>
4444
<artifactId>grpc-google-cloud-speech-v1</artifactId>
45-
<version>0.1.6</version>
45+
<version>0.1.7</version>
4646
<exclusions>
4747
<exclusion>
4848
<groupId>io.grpc</groupId>

‎google-cloud-trace/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.google.api.grpc</groupId>
3333
<artifactId>grpc-google-cloud-trace-v1</artifactId>
34-
<version>0.1.5</version>
34+
<version>0.1.7</version>
3535
<exclusions>
3636
<exclusion>
3737
<groupId>io.grpc</groupId>

0 commit comments

Comments
 (0)