Skip to content

Commit 5ee1326

Browse files
mziccardmziccard
authored
---
yaml --- r: 7657 b: refs/heads/tswast-patch-1 c: 09ad52a h: refs/heads/master i: 7655: 35c9740
1 parent b75083b commit 5ee1326

11 files changed

Lines changed: 169 additions & 17 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5757
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5858
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5959
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
60-
refs/heads/tswast-patch-1: a70747c5e30423ed1d11bf8aca82d35828747957
60+
refs/heads/tswast-patch-1: 09ad52ad44126be31a1c57e31823d77c36dc78f6
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

‎branches/tswast-patch-1/google-cloud-core/pom.xml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,20 +103,43 @@
103103
<artifactId>protobuf-java</artifactId>
104104
<version>3.0.0</version>
105105
</dependency>
106+
<dependency>
107+
<groupId>io.grpc</groupId>
108+
<artifactId>grpc-protobuf</artifactId>
109+
<version>${grpc.version}</version>
110+
</dependency>
106111
<dependency>
107112
<groupId>com.google.api</groupId>
108113
<artifactId>gax</artifactId>
109114
<version>0.0.21</version>
115+
<exclusions>
116+
<exclusion>
117+
<groupId>io.grpc</groupId>
118+
<artifactId>grpc-all</artifactId>
119+
</exclusion>
120+
</exclusions>
110121
</dependency>
111122
<dependency>
112123
<groupId>com.google.api.grpc</groupId>
113124
<artifactId>grpc-google-common-protos</artifactId>
114125
<version>0.1.0</version>
126+
<exclusions>
127+
<exclusion>
128+
<groupId>io.grpc</groupId>
129+
<artifactId>grpc-all</artifactId>
130+
</exclusion>
131+
</exclusions>
115132
</dependency>
116133
<dependency>
117134
<groupId>com.google.api.grpc</groupId>
118135
<artifactId>grpc-google-iam-v1</artifactId>
119136
<version>0.1.0</version>
137+
<exclusions>
138+
<exclusion>
139+
<groupId>io.grpc</groupId>
140+
<artifactId>grpc-all</artifactId>
141+
</exclusion>
142+
</exclusions>
120143
</dependency>
121144
</dependencies>
122145
</project>

‎branches/tswast-patch-1/google-cloud-errorreporting/pom.xml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,27 @@
3131
<groupId>com.google.api.grpc</groupId>
3232
<artifactId>grpc-google-devtools-clouderrorreporting-v1beta1</artifactId>
3333
<version>0.1.0</version>
34+
<exclusions>
35+
<exclusion>
36+
<groupId>io.grpc</groupId>
37+
<artifactId>grpc-all</artifactId>
38+
</exclusion>
39+
</exclusions>
3440
</dependency>
3541
<dependency>
3642
<groupId>io.grpc</groupId>
37-
<artifactId>grpc-all</artifactId>
38-
<version>1.0.1</version>
43+
<artifactId>grpc-netty</artifactId>
44+
<version>${grpc.version}</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>io.grpc</groupId>
48+
<artifactId>grpc-stub</artifactId>
49+
<version>${grpc.version}</version>
50+
</dependency>
51+
<dependency>
52+
<groupId>io.grpc</groupId>
53+
<artifactId>grpc-auth</artifactId>
54+
<version>${grpc.version}</version>
3955
</dependency>
4056
<dependency>
4157
<groupId>${project.groupId}</groupId>

‎branches/tswast-patch-1/google-cloud-language/pom.xml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,27 @@
3131
<groupId>com.google.api.grpc</groupId>
3232
<artifactId>grpc-google-cloud-language-v1beta1</artifactId>
3333
<version>0.1.0</version>
34+
<exclusions>
35+
<exclusion>
36+
<groupId>io.grpc</groupId>
37+
<artifactId>grpc-all</artifactId>
38+
</exclusion>
39+
</exclusions>
3440
</dependency>
3541
<dependency>
3642
<groupId>io.grpc</groupId>
37-
<artifactId>grpc-all</artifactId>
38-
<version>1.0.1</version>
43+
<artifactId>grpc-netty</artifactId>
44+
<version>${grpc.version}</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>io.grpc</groupId>
48+
<artifactId>grpc-stub</artifactId>
49+
<version>${grpc.version}</version>
50+
</dependency>
51+
<dependency>
52+
<groupId>io.grpc</groupId>
53+
<artifactId>grpc-auth</artifactId>
54+
<version>${grpc.version}</version>
3955
</dependency>
4056
<dependency>
4157
<groupId>${project.groupId}</groupId>

‎branches/tswast-patch-1/google-cloud-logging/pom.xml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,27 @@
3131
<groupId>com.google.api.grpc</groupId>
3232
<artifactId>grpc-google-logging-v2</artifactId>
3333
<version>0.1.1</version>
34+
<exclusions>
35+
<exclusion>
36+
<groupId>io.grpc</groupId>
37+
<artifactId>grpc-all</artifactId>
38+
</exclusion>
39+
</exclusions>
3440
</dependency>
3541
<dependency>
3642
<groupId>io.grpc</groupId>
37-
<artifactId>grpc-all</artifactId>
38-
<version>1.0.1</version>
43+
<artifactId>grpc-netty</artifactId>
44+
<version>${grpc.version}</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>io.grpc</groupId>
48+
<artifactId>grpc-stub</artifactId>
49+
<version>${grpc.version}</version>
50+
</dependency>
51+
<dependency>
52+
<groupId>io.grpc</groupId>
53+
<artifactId>grpc-auth</artifactId>
54+
<version>${grpc.version}</version>
3955
</dependency>
4056
<dependency>
4157
<groupId>${project.groupId}</groupId>

‎branches/tswast-patch-1/google-cloud-monitoring/pom.xml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,27 @@
3131
<groupId>com.google.api.grpc</groupId>
3232
<artifactId>grpc-google-monitoring-v3</artifactId>
3333
<version>0.1.0</version>
34+
<exclusions>
35+
<exclusion>
36+
<groupId>io.grpc</groupId>
37+
<artifactId>grpc-all</artifactId>
38+
</exclusion>
39+
</exclusions>
3440
</dependency>
3541
<dependency>
3642
<groupId>io.grpc</groupId>
37-
<artifactId>grpc-all</artifactId>
38-
<version>1.0.1</version>
43+
<artifactId>grpc-netty</artifactId>
44+
<version>${grpc.version}</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>io.grpc</groupId>
48+
<artifactId>grpc-stub</artifactId>
49+
<version>${grpc.version}</version>
50+
</dependency>
51+
<dependency>
52+
<groupId>io.grpc</groupId>
53+
<artifactId>grpc-auth</artifactId>
54+
<version>${grpc.version}</version>
3955
</dependency>
4056
<dependency>
4157
<groupId>${project.groupId}</groupId>

‎branches/tswast-patch-1/google-cloud-pubsub/pom.xml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,27 @@
3131
<groupId>com.google.api.grpc</groupId>
3232
<artifactId>grpc-google-pubsub-v1</artifactId>
3333
<version>0.1.0</version>
34+
<exclusions>
35+
<exclusion>
36+
<groupId>io.grpc</groupId>
37+
<artifactId>grpc-all</artifactId>
38+
</exclusion>
39+
</exclusions>
3440
</dependency>
3541
<dependency>
3642
<groupId>io.grpc</groupId>
37-
<artifactId>grpc-all</artifactId>
38-
<version>1.0.1</version>
43+
<artifactId>grpc-netty</artifactId>
44+
<version>${grpc.version}</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>io.grpc</groupId>
48+
<artifactId>grpc-stub</artifactId>
49+
<version>${grpc.version}</version>
50+
</dependency>
51+
<dependency>
52+
<groupId>io.grpc</groupId>
53+
<artifactId>grpc-auth</artifactId>
54+
<version>${grpc.version}</version>
3955
</dependency>
4056
<dependency>
4157
<groupId>${project.groupId}</groupId>

‎branches/tswast-patch-1/google-cloud-speech/pom.xml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,27 @@
3131
<groupId>com.google.api.grpc</groupId>
3232
<artifactId>grpc-google-cloud-speech-v1beta1</artifactId>
3333
<version>0.1.0</version>
34+
<exclusions>
35+
<exclusion>
36+
<groupId>io.grpc</groupId>
37+
<artifactId>grpc-all</artifactId>
38+
</exclusion>
39+
</exclusions>
3440
</dependency>
3541
<dependency>
3642
<groupId>io.grpc</groupId>
37-
<artifactId>grpc-all</artifactId>
38-
<version>1.0.1</version>
43+
<artifactId>grpc-netty</artifactId>
44+
<version>${grpc.version}</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>io.grpc</groupId>
48+
<artifactId>grpc-stub</artifactId>
49+
<version>${grpc.version}</version>
50+
</dependency>
51+
<dependency>
52+
<groupId>io.grpc</groupId>
53+
<artifactId>grpc-auth</artifactId>
54+
<version>${grpc.version}</version>
3955
</dependency>
4056
<dependency>
4157
<groupId>${project.groupId}</groupId>

‎branches/tswast-patch-1/google-cloud-trace/pom.xml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,27 @@
3131
<groupId>com.google.api.grpc</groupId>
3232
<artifactId>grpc-google-devtools-cloudtrace-v1</artifactId>
3333
<version>0.1.0</version>
34+
<exclusions>
35+
<exclusion>
36+
<groupId>io.grpc</groupId>
37+
<artifactId>grpc-all</artifactId>
38+
</exclusion>
39+
</exclusions>
3440
</dependency>
3541
<dependency>
3642
<groupId>io.grpc</groupId>
37-
<artifactId>grpc-all</artifactId>
38-
<version>1.0.1</version>
43+
<artifactId>grpc-netty</artifactId>
44+
<version>${grpc.version}</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>io.grpc</groupId>
48+
<artifactId>grpc-stub</artifactId>
49+
<version>${grpc.version}</version>
50+
</dependency>
51+
<dependency>
52+
<groupId>io.grpc</groupId>
53+
<artifactId>grpc-auth</artifactId>
54+
<version>${grpc.version}</version>
3955
</dependency>
4056
<dependency>
4157
<groupId>${project.groupId}</groupId>

‎branches/tswast-patch-1/google-cloud-vision/pom.xml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,27 @@
3131
<groupId>com.google.api.grpc</groupId>
3232
<artifactId>grpc-google-cloud-vision-v1</artifactId>
3333
<version>0.1.0</version>
34+
<exclusions>
35+
<exclusion>
36+
<groupId>io.grpc</groupId>
37+
<artifactId>grpc-all</artifactId>
38+
</exclusion>
39+
</exclusions>
3440
</dependency>
3541
<dependency>
3642
<groupId>io.grpc</groupId>
37-
<artifactId>grpc-all</artifactId>
38-
<version>1.0.1</version>
43+
<artifactId>grpc-netty</artifactId>
44+
<version>${grpc.version}</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>io.grpc</groupId>
48+
<artifactId>grpc-stub</artifactId>
49+
<version>${grpc.version}</version>
50+
</dependency>
51+
<dependency>
52+
<groupId>io.grpc</groupId>
53+
<artifactId>grpc-auth</artifactId>
54+
<version>${grpc.version}</version>
3955
</dependency>
4056
<dependency>
4157
<groupId>${project.groupId}</groupId>

0 commit comments

Comments
 (0)