Skip to content

Commit 376a1e2

Browse files
lqiu96lqiu96
committed
chore: Use the latest version of protobuf split repos
1 parent 7ca5795 commit 376a1e2

File tree

13 files changed

+57
-63
lines changed

13 files changed

+57
-63
lines changed

‎gapic-generator-java/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,12 +449,16 @@
449449
<groupId>com.google.protobuf</groupId>
450450
<artifactId>protobuf-java</artifactId>
451451
</exclusion>
452+
<exclusion>
453+
<groupId>com.google.api.grpc</groupId>
454+
<artifactId>proto-google-common-protos</artifactId>
455+
</exclusion>
452456
</exclusions>
453457
</dependency>
454458
<dependency>
455459
<groupId>org.example</groupId>
456460
<artifactId>protobuf-sdk</artifactId>
457-
<version>1.0-SNAPSHOT</version>
461+
<version>latest-1.0-SNAPSHOT</version>
458462
</dependency>
459463
<dependency>
460464
<groupId>org.yaml</groupId>

‎gax-java/gax-grpc/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<dependency>
2727
<groupId>org.example</groupId>
2828
<artifactId>protobuf-api</artifactId>
29-
<version>1.0-SNAPSHOT</version>
29+
<version>latest-1.0-SNAPSHOT</version>
3030
</dependency>
3131
<dependency>
3232
<groupId>com.google.api.grpc</groupId>
@@ -79,6 +79,10 @@
7979
<groupId>com.google.protobuf</groupId>
8080
<artifactId>protobuf-java</artifactId>
8181
</exclusion>
82+
<exclusion>
83+
<groupId>com.google.api.grpc</groupId>
84+
<artifactId>proto-google-common-protos</artifactId>
85+
</exclusion>
8286
</exclusions>
8387
</dependency>
8488
<dependency>

‎gax-java/gax-httpjson/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<dependency>
5757
<groupId>org.example</groupId>
5858
<artifactId>protobuf-api</artifactId>
59-
<version>1.0-SNAPSHOT</version>
59+
<version>latest-1.0-SNAPSHOT</version>
6060
</dependency>
6161
<dependency>
6262
<groupId>org.threeten</groupId>

‎gax-java/gax/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>org.example</groupId>
4444
<artifactId>protobuf-api</artifactId>
45-
<version>1.0-SNAPSHOT</version>
45+
<version>latest-1.0-SNAPSHOT</version>
4646
</dependency>
4747
<dependency>
4848
<groupId>com.google.protobuf</groupId>

‎java-common-protos/grpc-google-common-protos/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
<groupId>com.google.protobuf</groupId>
3030
<artifactId>protobuf-java</artifactId>
3131
</exclusion>
32+
<exclusion>
33+
<groupId>com.google.api.grpc</groupId>
34+
<artifactId>proto-google-common-protos</artifactId>
35+
</exclusion>
3236
</exclusions>
3337
</dependency>
3438
<!-- <dependency>-->
@@ -38,7 +42,7 @@
3842
<dependency>
3943
<groupId>org.example</groupId>
4044
<artifactId>protobuf-api</artifactId>
41-
<version>1.0-SNAPSHOT</version>
45+
<version>latest-1.0-SNAPSHOT</version>
4246
</dependency>
4347
<dependency>
4448
<groupId>com.google.guava</groupId>

‎java-common-protos/proto-google-common-protos/pom.xml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<dependency>
2020
<groupId>org.example</groupId>
2121
<artifactId>protobuf-sdk</artifactId>
22-
<version>1.0-SNAPSHOT</version>
22+
<version>latest-1.0-SNAPSHOT</version>
2323
</dependency>
2424
</dependencies>
2525

@@ -50,7 +50,6 @@
5050
<pattern>com.google.protobuf</pattern>
5151
<shadedPattern>com.shaded.google.protobuf.common.protos</shadedPattern>
5252
<excludes>
53-
<exclude>com.google.protobuf.AbstractMessage</exclude>
5453
<exclude>com.google.protobuf.AbstractMessageLite</exclude>
5554
<exclude>com.google.protobuf.AbstractParser</exclude>
5655
<exclude>com.google.protobuf.AbstractProtobufList</exclude>
@@ -115,7 +114,6 @@
115114
<exclude>com.google.protobuf.FloatArrayList</exclude>
116115
<exclude>com.google.protobuf.FloatValue</exclude>
117116
<exclude>com.google.protobuf.FloatValueOrBuilder</exclude>
118-
<exclude>com.google.protobuf.GeneratedMessage</exclude>
119117
<exclude>com.google.protobuf.GeneratedMessageInfoFactory</exclude>
120118
<exclude>com.google.protobuf.GeneratedMessageLite</exclude>
121119
<exclude>com.google.protobuf.InlineMe</exclude>
@@ -133,6 +131,7 @@
133131
<exclude>com.google.protobuf.LazyFieldLite</exclude>
134132
<exclude>com.google.protobuf.LazyStringArrayList</exclude>
135133
<exclude>com.google.protobuf.LazyStringList</exclude>
134+
<exclude>com.google.protobuf.LimitedInputStream</exclude>
136135
<exclude>com.google.protobuf.ListFieldSchema</exclude>
137136
<exclude>com.google.protobuf.ListValue</exclude>
138137
<exclude>com.google.protobuf.ListValueOrBuilder</exclude>
@@ -165,7 +164,6 @@
165164
<exclude>com.google.protobuf.NewInstanceSchema</exclude>
166165
<exclude>com.google.protobuf.NewInstanceSchemaLite</exclude>
167166
<exclude>com.google.protobuf.NewInstanceSchemas</exclude>
168-
<exclude>com.google.protobuf.NioByteString</exclude>
169167
<exclude>com.google.protobuf.NullValue</exclude>
170168
<exclude>com.google.protobuf.OneofInfo</exclude>
171169
<exclude>com.google.protobuf.Option</exclude>
@@ -180,10 +178,10 @@
180178
<exclude>com.google.protobuf.RawMessageInfo</exclude>
181179
<exclude>com.google.protobuf.Reader</exclude>
182180
<exclude>com.google.protobuf.RepeatedFieldBuilderV3</exclude>
183-
<exclude>com.google.protobuf.RopeByteString</exclude>
184181
<exclude>com.google.protobuf.Schema</exclude>
185182
<exclude>com.google.protobuf.SchemaFactory</exclude>
186183
<exclude>com.google.protobuf.SchemaUtil</exclude>
184+
<exclude>com.google.protobuf.SerializedForm</exclude>
187185
<exclude>com.google.protobuf.SingleFieldBuilderV3</exclude>
188186
<exclude>com.google.protobuf.SmallSortedMap</exclude>
189187
<exclude>com.google.protobuf.SourceContext</exclude>
@@ -217,7 +215,6 @@
217215
<exclude>com.google.protobuf.UnknownFieldSetLite</exclude>
218216
<exclude>com.google.protobuf.UnknownFieldSetLiteSchema</exclude>
219217
<exclude>com.google.protobuf.UnmodifiableLazyStringList</exclude>
220-
<exclude>com.google.protobuf.UnsafeByteOperations</exclude>
221218
<exclude>com.google.protobuf.UnsafeUtil</exclude>
222219
<exclude>com.google.protobuf.Utf8</exclude>
223220
<exclude>com.google.protobuf.Value</exclude>
@@ -226,7 +223,6 @@
226223
<exclude>com.google.protobuf.WrappersProto</exclude>
227224
<exclude>com.google.protobuf.Writer</exclude>
228225

229-
<exclude>com.google.protobuf.AbstractMessage$*</exclude>
230226
<exclude>com.google.protobuf.AbstractMessageLite$*</exclude>
231227
<exclude>com.google.protobuf.AbstractParser$*</exclude>
232228
<exclude>com.google.protobuf.AbstractProtobufList$*</exclude>
@@ -291,7 +287,6 @@
291287
<exclude>com.google.protobuf.FloatArrayList$*</exclude>
292288
<exclude>com.google.protobuf.FloatValue$*</exclude>
293289
<exclude>com.google.protobuf.FloatValueOrBuilder$*</exclude>
294-
<exclude>com.google.protobuf.GeneratedMessage$*</exclude>
295290
<exclude>com.google.protobuf.GeneratedMessageInfoFactory$*</exclude>
296291
<exclude>com.google.protobuf.GeneratedMessageLite$*</exclude>
297292
<exclude>com.google.protobuf.InlineMe$*</exclude>
@@ -309,6 +304,7 @@
309304
<exclude>com.google.protobuf.LazyFieldLite$*</exclude>
310305
<exclude>com.google.protobuf.LazyStringArrayList$*</exclude>
311306
<exclude>com.google.protobuf.LazyStringList$*</exclude>
307+
<exclude>com.google.protobuf.LimitedInputStream$*</exclude>
312308
<exclude>com.google.protobuf.ListFieldSchema$*</exclude>
313309
<exclude>com.google.protobuf.ListValue$*</exclude>
314310
<exclude>com.google.protobuf.ListValueOrBuilder$*</exclude>
@@ -341,7 +337,6 @@
341337
<exclude>com.google.protobuf.NewInstanceSchema$*</exclude>
342338
<exclude>com.google.protobuf.NewInstanceSchemaLite$*</exclude>
343339
<exclude>com.google.protobuf.NewInstanceSchemas$*</exclude>
344-
<exclude>com.google.protobuf.NioByteString$*</exclude>
345340
<exclude>com.google.protobuf.NullValue$*</exclude>
346341
<exclude>com.google.protobuf.OneofInfo$*</exclude>
347342
<exclude>com.google.protobuf.Option$*</exclude>
@@ -356,10 +351,10 @@
356351
<exclude>com.google.protobuf.RawMessageInfo$*</exclude>
357352
<exclude>com.google.protobuf.Reader$*</exclude>
358353
<exclude>com.google.protobuf.RepeatedFieldBuilderV3$*</exclude>
359-
<exclude>com.google.protobuf.RopeByteString$*</exclude>
360354
<exclude>com.google.protobuf.Schema$*</exclude>
361355
<exclude>com.google.protobuf.SchemaFactory$*</exclude>
362356
<exclude>com.google.protobuf.SchemaUtil$*</exclude>
357+
<exclude>com.google.protobuf.SerializedForm$*</exclude>
363358
<exclude>com.google.protobuf.SingleFieldBuilderV3$*</exclude>
364359
<exclude>com.google.protobuf.SmallSortedMap$*</exclude>
365360
<exclude>com.google.protobuf.SourceContext$*</exclude>
@@ -393,7 +388,6 @@
393388
<exclude>com.google.protobuf.UnknownFieldSetLite$*</exclude>
394389
<exclude>com.google.protobuf.UnknownFieldSetLiteSchema$*</exclude>
395390
<exclude>com.google.protobuf.UnmodifiableLazyStringList$*</exclude>
396-
<exclude>com.google.protobuf.UnsafeByteOperations$*</exclude>
397391
<exclude>com.google.protobuf.UnsafeUtil$*</exclude>
398392
<exclude>com.google.protobuf.Utf8$*</exclude>
399393
<exclude>com.google.protobuf.Value$*</exclude>

‎java-core/google-cloud-core/pom.xml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<dependency>
8383
<groupId>org.example</groupId>
8484
<artifactId>protobuf-sdk</artifactId>
85-
<version>1.0-SNAPSHOT</version>
85+
<version>latest-1.0-SNAPSHOT</version>
8686
</dependency>
8787
<dependency>
8888
<groupId>com.google.errorprone</groupId>
@@ -152,7 +152,6 @@
152152
<pattern>com.google.protobuf</pattern>
153153
<shadedPattern>com.shaded.google.protobuf.core</shadedPattern>
154154
<excludes>
155-
<exclude>com.google.protobuf.AbstractMessage</exclude>
156155
<exclude>com.google.protobuf.AbstractMessageLite</exclude>
157156
<exclude>com.google.protobuf.AbstractParser</exclude>
158157
<exclude>com.google.protobuf.AbstractProtobufList</exclude>
@@ -217,7 +216,6 @@
217216
<exclude>com.google.protobuf.FloatArrayList</exclude>
218217
<exclude>com.google.protobuf.FloatValue</exclude>
219218
<exclude>com.google.protobuf.FloatValueOrBuilder</exclude>
220-
<exclude>com.google.protobuf.GeneratedMessage</exclude>
221219
<exclude>com.google.protobuf.GeneratedMessageInfoFactory</exclude>
222220
<exclude>com.google.protobuf.GeneratedMessageLite</exclude>
223221
<exclude>com.google.protobuf.InlineMe</exclude>
@@ -235,6 +233,7 @@
235233
<exclude>com.google.protobuf.LazyFieldLite</exclude>
236234
<exclude>com.google.protobuf.LazyStringArrayList</exclude>
237235
<exclude>com.google.protobuf.LazyStringList</exclude>
236+
<exclude>com.google.protobuf.LimitedInputStream</exclude>
238237
<exclude>com.google.protobuf.ListFieldSchema</exclude>
239238
<exclude>com.google.protobuf.ListValue</exclude>
240239
<exclude>com.google.protobuf.ListValueOrBuilder</exclude>
@@ -267,7 +266,6 @@
267266
<exclude>com.google.protobuf.NewInstanceSchema</exclude>
268267
<exclude>com.google.protobuf.NewInstanceSchemaLite</exclude>
269268
<exclude>com.google.protobuf.NewInstanceSchemas</exclude>
270-
<exclude>com.google.protobuf.NioByteString</exclude>
271269
<exclude>com.google.protobuf.NullValue</exclude>
272270
<exclude>com.google.protobuf.OneofInfo</exclude>
273271
<exclude>com.google.protobuf.Option</exclude>
@@ -282,10 +280,10 @@
282280
<exclude>com.google.protobuf.RawMessageInfo</exclude>
283281
<exclude>com.google.protobuf.Reader</exclude>
284282
<exclude>com.google.protobuf.RepeatedFieldBuilderV3</exclude>
285-
<exclude>com.google.protobuf.RopeByteString</exclude>
286283
<exclude>com.google.protobuf.Schema</exclude>
287284
<exclude>com.google.protobuf.SchemaFactory</exclude>
288285
<exclude>com.google.protobuf.SchemaUtil</exclude>
286+
<exclude>com.google.protobuf.SerializedForm</exclude>
289287
<exclude>com.google.protobuf.SingleFieldBuilderV3</exclude>
290288
<exclude>com.google.protobuf.SmallSortedMap</exclude>
291289
<exclude>com.google.protobuf.SourceContext</exclude>
@@ -319,7 +317,6 @@
319317
<exclude>com.google.protobuf.UnknownFieldSetLite</exclude>
320318
<exclude>com.google.protobuf.UnknownFieldSetLiteSchema</exclude>
321319
<exclude>com.google.protobuf.UnmodifiableLazyStringList</exclude>
322-
<exclude>com.google.protobuf.UnsafeByteOperations</exclude>
323320
<exclude>com.google.protobuf.UnsafeUtil</exclude>
324321
<exclude>com.google.protobuf.Utf8</exclude>
325322
<exclude>com.google.protobuf.Value</exclude>
@@ -328,7 +325,6 @@
328325
<exclude>com.google.protobuf.WrappersProto</exclude>
329326
<exclude>com.google.protobuf.Writer</exclude>
330327

331-
<exclude>com.google.protobuf.AbstractMessage$*</exclude>
332328
<exclude>com.google.protobuf.AbstractMessageLite$*</exclude>
333329
<exclude>com.google.protobuf.AbstractParser$*</exclude>
334330
<exclude>com.google.protobuf.AbstractProtobufList$*</exclude>
@@ -393,7 +389,6 @@
393389
<exclude>com.google.protobuf.FloatArrayList$*</exclude>
394390
<exclude>com.google.protobuf.FloatValue$*</exclude>
395391
<exclude>com.google.protobuf.FloatValueOrBuilder$*</exclude>
396-
<exclude>com.google.protobuf.GeneratedMessage$*</exclude>
397392
<exclude>com.google.protobuf.GeneratedMessageInfoFactory$*</exclude>
398393
<exclude>com.google.protobuf.GeneratedMessageLite$*</exclude>
399394
<exclude>com.google.protobuf.InlineMe$*</exclude>
@@ -411,6 +406,7 @@
411406
<exclude>com.google.protobuf.LazyFieldLite$*</exclude>
412407
<exclude>com.google.protobuf.LazyStringArrayList$*</exclude>
413408
<exclude>com.google.protobuf.LazyStringList$*</exclude>
409+
<exclude>com.google.protobuf.LimitedInputStream$*</exclude>
414410
<exclude>com.google.protobuf.ListFieldSchema$*</exclude>
415411
<exclude>com.google.protobuf.ListValue$*</exclude>
416412
<exclude>com.google.protobuf.ListValueOrBuilder$*</exclude>
@@ -443,7 +439,6 @@
443439
<exclude>com.google.protobuf.NewInstanceSchema$*</exclude>
444440
<exclude>com.google.protobuf.NewInstanceSchemaLite$*</exclude>
445441
<exclude>com.google.protobuf.NewInstanceSchemas$*</exclude>
446-
<exclude>com.google.protobuf.NioByteString$*</exclude>
447442
<exclude>com.google.protobuf.NullValue$*</exclude>
448443
<exclude>com.google.protobuf.OneofInfo$*</exclude>
449444
<exclude>com.google.protobuf.Option$*</exclude>
@@ -458,10 +453,10 @@
458453
<exclude>com.google.protobuf.RawMessageInfo$*</exclude>
459454
<exclude>com.google.protobuf.Reader$*</exclude>
460455
<exclude>com.google.protobuf.RepeatedFieldBuilderV3$*</exclude>
461-
<exclude>com.google.protobuf.RopeByteString$*</exclude>
462456
<exclude>com.google.protobuf.Schema$*</exclude>
463457
<exclude>com.google.protobuf.SchemaFactory$*</exclude>
464458
<exclude>com.google.protobuf.SchemaUtil$*</exclude>
459+
<exclude>com.google.protobuf.SerializedForm$*</exclude>
465460
<exclude>com.google.protobuf.SingleFieldBuilderV3$*</exclude>
466461
<exclude>com.google.protobuf.SmallSortedMap$*</exclude>
467462
<exclude>com.google.protobuf.SourceContext$*</exclude>
@@ -495,7 +490,6 @@
495490
<exclude>com.google.protobuf.UnknownFieldSetLite$*</exclude>
496491
<exclude>com.google.protobuf.UnknownFieldSetLiteSchema$*</exclude>
497492
<exclude>com.google.protobuf.UnmodifiableLazyStringList$*</exclude>
498-
<exclude>com.google.protobuf.UnsafeByteOperations$*</exclude>
499493
<exclude>com.google.protobuf.UnsafeUtil$*</exclude>
500494
<exclude>com.google.protobuf.Utf8$*</exclude>
501495
<exclude>com.google.protobuf.Value$*</exclude>

‎java-iam/grpc-google-iam-v1/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
<groupId>com.google.protobuf</groupId>
3030
<artifactId>protobuf-java</artifactId>
3131
</exclusion>
32+
<exclusion>
33+
<groupId>com.google.api.grpc</groupId>
34+
<artifactId>proto-google-common-protos</artifactId>
35+
</exclusion>
3236
</exclusions>
3337
</dependency>
3438
<!-- <dependency>-->
@@ -38,7 +42,7 @@
3842
<dependency>
3943
<groupId>org.example</groupId>
4044
<artifactId>protobuf-api</artifactId>
41-
<version>1.0-SNAPSHOT</version>
45+
<version>latest-1.0-SNAPSHOT</version>
4246
</dependency>
4347
<dependency>
4448
<groupId>com.google.guava</groupId>

‎java-iam/grpc-google-iam-v2/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
<groupId>com.google.protobuf</groupId>
3030
<artifactId>protobuf-java</artifactId>
3131
</exclusion>
32+
<exclusion>
33+
<groupId>com.google.api.grpc</groupId>
34+
<artifactId>proto-google-common-protos</artifactId>
35+
</exclusion>
3236
</exclusions>
3337
</dependency>
3438
<!-- <dependency>-->
@@ -38,7 +42,7 @@
3842
<dependency>
3943
<groupId>org.example</groupId>
4044
<artifactId>protobuf-api</artifactId>
41-
<version>1.0-SNAPSHOT</version>
45+
<version>latest-1.0-SNAPSHOT</version>
4246
</dependency>
4347
<dependency>
4448
<groupId>com.google.api.grpc</groupId>

‎java-iam/grpc-google-iam-v2beta/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
<groupId>com.google.protobuf</groupId>
3030
<artifactId>protobuf-java</artifactId>
3131
</exclusion>
32+
<exclusion>
33+
<groupId>com.google.api.grpc</groupId>
34+
<artifactId>proto-google-common-protos</artifactId>
35+
</exclusion>
3236
</exclusions>
3337
</dependency>
3438
<!-- <dependency>-->
@@ -38,7 +42,7 @@
3842
<dependency>
3943
<groupId>org.example</groupId>
4044
<artifactId>protobuf-api</artifactId>
41-
<version>1.0-SNAPSHOT</version>
45+
<version>latest-1.0-SNAPSHOT</version>
4246
</dependency>
4347
<dependency>
4448
<groupId>com.google.api.grpc</groupId>

0 commit comments

Comments
 (0)