Skip to content

Commit 72ce5ee

Browse files
lqiu96lqiu96
committed
chore: Use new shading configs
1 parent 3817a1d commit 72ce5ee

File tree

5 files changed

+50
-20
lines changed
  • java-common-protos/proto-google-common-protos
  • java-core/google-cloud-core
  • java-iam

5 files changed

+50
-20
lines changed

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
<pattern>com.google.protobuf</pattern>
5252
<shadedPattern>com.shaded.google.protobuf.common.protos</shadedPattern>
5353
<excludes>
54+
<exclude>com.google.protobuf.AbstractMessageInternal</exclude>
5455
<exclude>com.google.protobuf.AbstractMessageLite</exclude>
5556
<exclude>com.google.protobuf.AbstractParser</exclude>
5657
<exclude>com.google.protobuf.AbstractProtobufList</exclude>
@@ -116,7 +117,9 @@
116117
<exclude>com.google.protobuf.FloatValue</exclude>
117118
<exclude>com.google.protobuf.FloatValueOrBuilder</exclude>
118119
<exclude>com.google.protobuf.GeneratedMessageInfoFactory</exclude>
120+
<exclude>com.google.protobuf.GeneratedMessageInternal</exclude>
119121
<exclude>com.google.protobuf.GeneratedMessageLite</exclude>
122+
<exclude>com.google.protobuf.GeneratedMessageV3Internal</exclude>
120123
<exclude>com.google.protobuf.InlineMe</exclude>
121124
<exclude>com.google.protobuf.Int32Value</exclude>
122125
<exclude>com.google.protobuf.Int32ValueOrBuilder</exclude>
@@ -179,13 +182,13 @@
179182
<exclude>com.google.protobuf.ProtoSyntax</exclude>
180183
<exclude>com.google.protobuf.RawMessageInfo</exclude>
181184
<exclude>com.google.protobuf.Reader</exclude>
182-
<exclude>com.google.protobuf.RepeatedFieldBuilderV3</exclude>
185+
<exclude>com.google.protobuf.RepeatedFieldBuilderV3Internal</exclude>
183186
<exclude>com.google.protobuf.RopeByteString</exclude>
184187
<exclude>com.google.protobuf.Schema</exclude>
185188
<exclude>com.google.protobuf.SchemaFactory</exclude>
186189
<exclude>com.google.protobuf.SchemaUtil</exclude>
187190
<exclude>com.google.protobuf.SerializedForm</exclude>
188-
<exclude>com.google.protobuf.SingleFieldBuilderV3</exclude>
191+
<exclude>com.google.protobuf.SingleFieldBuilderV3Internal</exclude>
189192
<exclude>com.google.protobuf.SmallSortedMap</exclude>
190193
<exclude>com.google.protobuf.SourceContext</exclude>
191194
<exclude>com.google.protobuf.SourceContextOrBuilder</exclude>
@@ -224,6 +227,7 @@
224227
<exclude>com.google.protobuf.WrappersProto</exclude>
225228
<exclude>com.google.protobuf.Writer</exclude>
226229

230+
<exclude>com.google.protobuf.AbstractMessageInternal$*</exclude>
227231
<exclude>com.google.protobuf.AbstractMessageLite$*</exclude>
228232
<exclude>com.google.protobuf.AbstractParser$*</exclude>
229233
<exclude>com.google.protobuf.AbstractProtobufList$*</exclude>
@@ -289,7 +293,9 @@
289293
<exclude>com.google.protobuf.FloatValue$*</exclude>
290294
<exclude>com.google.protobuf.FloatValueOrBuilder$*</exclude>
291295
<exclude>com.google.protobuf.GeneratedMessageInfoFactory$*</exclude>
296+
<exclude>com.google.protobuf.GeneratedMessageInternal$*</exclude>
292297
<exclude>com.google.protobuf.GeneratedMessageLite$*</exclude>
298+
<exclude>com.google.protobuf.GeneratedMessageV3Internal$*</exclude>
293299
<exclude>com.google.protobuf.InlineMe$*</exclude>
294300
<exclude>com.google.protobuf.Int32Value$*</exclude>
295301
<exclude>com.google.protobuf.Int32ValueOrBuilder$*</exclude>
@@ -352,13 +358,13 @@
352358
<exclude>com.google.protobuf.ProtoSyntax$*</exclude>
353359
<exclude>com.google.protobuf.RawMessageInfo$*</exclude>
354360
<exclude>com.google.protobuf.Reader$*</exclude>
355-
<exclude>com.google.protobuf.RepeatedFieldBuilderV3$*</exclude>
361+
<exclude>com.google.protobuf.RepeatedFieldBuilderV3Internal$*</exclude>
356362
<exclude>com.google.protobuf.RopeByteString$*</exclude>
357363
<exclude>com.google.protobuf.Schema$*</exclude>
358364
<exclude>com.google.protobuf.SchemaFactory$*</exclude>
359365
<exclude>com.google.protobuf.SchemaUtil$*</exclude>
360366
<exclude>com.google.protobuf.SerializedForm$*</exclude>
361-
<exclude>com.google.protobuf.SingleFieldBuilderV3$*</exclude>
367+
<exclude>com.google.protobuf.SingleFieldBuilderV3Internal$*</exclude>
362368
<exclude>com.google.protobuf.SmallSortedMap$*</exclude>
363369
<exclude>com.google.protobuf.SourceContext$*</exclude>
364370
<exclude>com.google.protobuf.SourceContextOrBuilder$*</exclude>

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@
153153
<pattern>com.google.protobuf</pattern>
154154
<shadedPattern>com.shaded.google.protobuf.core</shadedPattern>
155155
<excludes>
156+
<exclude>com.google.protobuf.AbstractMessageInternal</exclude>
156157
<exclude>com.google.protobuf.AbstractMessageLite</exclude>
157158
<exclude>com.google.protobuf.AbstractParser</exclude>
158159
<exclude>com.google.protobuf.AbstractProtobufList</exclude>
@@ -218,7 +219,9 @@
218219
<exclude>com.google.protobuf.FloatValue</exclude>
219220
<exclude>com.google.protobuf.FloatValueOrBuilder</exclude>
220221
<exclude>com.google.protobuf.GeneratedMessageInfoFactory</exclude>
222+
<exclude>com.google.protobuf.GeneratedMessageInternal</exclude>
221223
<exclude>com.google.protobuf.GeneratedMessageLite</exclude>
224+
<exclude>com.google.protobuf.GeneratedMessageV3Internal</exclude>
222225
<exclude>com.google.protobuf.InlineMe</exclude>
223226
<exclude>com.google.protobuf.Int32Value</exclude>
224227
<exclude>com.google.protobuf.Int32ValueOrBuilder</exclude>
@@ -281,13 +284,13 @@
281284
<exclude>com.google.protobuf.ProtoSyntax</exclude>
282285
<exclude>com.google.protobuf.RawMessageInfo</exclude>
283286
<exclude>com.google.protobuf.Reader</exclude>
284-
<exclude>com.google.protobuf.RepeatedFieldBuilderV3</exclude>
287+
<exclude>com.google.protobuf.RepeatedFieldBuilderV3Internal</exclude>
285288
<exclude>com.google.protobuf.RopeByteString</exclude>
286289
<exclude>com.google.protobuf.Schema</exclude>
287290
<exclude>com.google.protobuf.SchemaFactory</exclude>
288291
<exclude>com.google.protobuf.SchemaUtil</exclude>
289292
<exclude>com.google.protobuf.SerializedForm</exclude>
290-
<exclude>com.google.protobuf.SingleFieldBuilderV3</exclude>
293+
<exclude>com.google.protobuf.SingleFieldBuilderV3Internal</exclude>
291294
<exclude>com.google.protobuf.SmallSortedMap</exclude>
292295
<exclude>com.google.protobuf.SourceContext</exclude>
293296
<exclude>com.google.protobuf.SourceContextOrBuilder</exclude>
@@ -326,6 +329,7 @@
326329
<exclude>com.google.protobuf.WrappersProto</exclude>
327330
<exclude>com.google.protobuf.Writer</exclude>
328331

332+
<exclude>com.google.protobuf.AbstractMessageInternal$*</exclude>
329333
<exclude>com.google.protobuf.AbstractMessageLite$*</exclude>
330334
<exclude>com.google.protobuf.AbstractParser$*</exclude>
331335
<exclude>com.google.protobuf.AbstractProtobufList$*</exclude>
@@ -391,7 +395,9 @@
391395
<exclude>com.google.protobuf.FloatValue$*</exclude>
392396
<exclude>com.google.protobuf.FloatValueOrBuilder$*</exclude>
393397
<exclude>com.google.protobuf.GeneratedMessageInfoFactory$*</exclude>
398+
<exclude>com.google.protobuf.GeneratedMessageInternal$*</exclude>
394399
<exclude>com.google.protobuf.GeneratedMessageLite$*</exclude>
400+
<exclude>com.google.protobuf.GeneratedMessageV3Internal$*</exclude>
395401
<exclude>com.google.protobuf.InlineMe$*</exclude>
396402
<exclude>com.google.protobuf.Int32Value$*</exclude>
397403
<exclude>com.google.protobuf.Int32ValueOrBuilder$*</exclude>
@@ -454,13 +460,13 @@
454460
<exclude>com.google.protobuf.ProtoSyntax$*</exclude>
455461
<exclude>com.google.protobuf.RawMessageInfo$*</exclude>
456462
<exclude>com.google.protobuf.Reader$*</exclude>
457-
<exclude>com.google.protobuf.RepeatedFieldBuilderV3$*</exclude>
463+
<exclude>com.google.protobuf.RepeatedFieldBuilderV3Internal$*</exclude>
458464
<exclude>com.google.protobuf.RopeByteString$*</exclude>
459465
<exclude>com.google.protobuf.Schema$*</exclude>
460466
<exclude>com.google.protobuf.SchemaFactory$*</exclude>
461467
<exclude>com.google.protobuf.SchemaUtil$*</exclude>
462468
<exclude>com.google.protobuf.SerializedForm$*</exclude>
463-
<exclude>com.google.protobuf.SingleFieldBuilderV3$*</exclude>
469+
<exclude>com.google.protobuf.SingleFieldBuilderV3Internal$*</exclude>
464470
<exclude>com.google.protobuf.SmallSortedMap$*</exclude>
465471
<exclude>com.google.protobuf.SourceContext$*</exclude>
466472
<exclude>com.google.protobuf.SourceContextOrBuilder$*</exclude>

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
<pattern>com.google.protobuf</pattern>
5656
<shadedPattern>com.shaded.google.protobuf.iam.v1</shadedPattern>
5757
<excludes>
58+
<exclude>com.google.protobuf.AbstractMessageInternal</exclude>
5859
<exclude>com.google.protobuf.AbstractMessageLite</exclude>
5960
<exclude>com.google.protobuf.AbstractParser</exclude>
6061
<exclude>com.google.protobuf.AbstractProtobufList</exclude>
@@ -120,7 +121,9 @@
120121
<exclude>com.google.protobuf.FloatValue</exclude>
121122
<exclude>com.google.protobuf.FloatValueOrBuilder</exclude>
122123
<exclude>com.google.protobuf.GeneratedMessageInfoFactory</exclude>
124+
<exclude>com.google.protobuf.GeneratedMessageInternal</exclude>
123125
<exclude>com.google.protobuf.GeneratedMessageLite</exclude>
126+
<exclude>com.google.protobuf.GeneratedMessageV3Internal</exclude>
124127
<exclude>com.google.protobuf.InlineMe</exclude>
125128
<exclude>com.google.protobuf.Int32Value</exclude>
126129
<exclude>com.google.protobuf.Int32ValueOrBuilder</exclude>
@@ -183,13 +186,13 @@
183186
<exclude>com.google.protobuf.ProtoSyntax</exclude>
184187
<exclude>com.google.protobuf.RawMessageInfo</exclude>
185188
<exclude>com.google.protobuf.Reader</exclude>
186-
<exclude>com.google.protobuf.RepeatedFieldBuilderV3</exclude>
189+
<exclude>com.google.protobuf.RepeatedFieldBuilderV3Internal</exclude>
187190
<exclude>com.google.protobuf.RopeByteString</exclude>
188191
<exclude>com.google.protobuf.Schema</exclude>
189192
<exclude>com.google.protobuf.SchemaFactory</exclude>
190193
<exclude>com.google.protobuf.SchemaUtil</exclude>
191194
<exclude>com.google.protobuf.SerializedForm</exclude>
192-
<exclude>com.google.protobuf.SingleFieldBuilderV3</exclude>
195+
<exclude>com.google.protobuf.SingleFieldBuilderV3Internal</exclude>
193196
<exclude>com.google.protobuf.SmallSortedMap</exclude>
194197
<exclude>com.google.protobuf.SourceContext</exclude>
195198
<exclude>com.google.protobuf.SourceContextOrBuilder</exclude>
@@ -228,6 +231,7 @@
228231
<exclude>com.google.protobuf.WrappersProto</exclude>
229232
<exclude>com.google.protobuf.Writer</exclude>
230233

234+
<exclude>com.google.protobuf.AbstractMessageInternal$*</exclude>
231235
<exclude>com.google.protobuf.AbstractMessageLite$*</exclude>
232236
<exclude>com.google.protobuf.AbstractParser$*</exclude>
233237
<exclude>com.google.protobuf.AbstractProtobufList$*</exclude>
@@ -293,7 +297,9 @@
293297
<exclude>com.google.protobuf.FloatValue$*</exclude>
294298
<exclude>com.google.protobuf.FloatValueOrBuilder$*</exclude>
295299
<exclude>com.google.protobuf.GeneratedMessageInfoFactory$*</exclude>
300+
<exclude>com.google.protobuf.GeneratedMessageInternal$*</exclude>
296301
<exclude>com.google.protobuf.GeneratedMessageLite$*</exclude>
302+
<exclude>com.google.protobuf.GeneratedMessageV3Internal$*</exclude>
297303
<exclude>com.google.protobuf.InlineMe$*</exclude>
298304
<exclude>com.google.protobuf.Int32Value$*</exclude>
299305
<exclude>com.google.protobuf.Int32ValueOrBuilder$*</exclude>
@@ -356,13 +362,13 @@
356362
<exclude>com.google.protobuf.ProtoSyntax$*</exclude>
357363
<exclude>com.google.protobuf.RawMessageInfo$*</exclude>
358364
<exclude>com.google.protobuf.Reader$*</exclude>
359-
<exclude>com.google.protobuf.RepeatedFieldBuilderV3$*</exclude>
365+
<exclude>com.google.protobuf.RepeatedFieldBuilderV3Internal$*</exclude>
360366
<exclude>com.google.protobuf.RopeByteString$*</exclude>
361367
<exclude>com.google.protobuf.Schema$*</exclude>
362368
<exclude>com.google.protobuf.SchemaFactory$*</exclude>
363369
<exclude>com.google.protobuf.SchemaUtil$*</exclude>
364370
<exclude>com.google.protobuf.SerializedForm$*</exclude>
365-
<exclude>com.google.protobuf.SingleFieldBuilderV3$*</exclude>
371+
<exclude>com.google.protobuf.SingleFieldBuilderV3Internal$*</exclude>
366372
<exclude>com.google.protobuf.SmallSortedMap$*</exclude>
367373
<exclude>com.google.protobuf.SourceContext$*</exclude>
368374
<exclude>com.google.protobuf.SourceContextOrBuilder$*</exclude>

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
<pattern>com.google.protobuf</pattern>
5858
<shadedPattern>com.shaded.google.protobuf.iam.v2</shadedPattern>
5959
<excludes>
60+
<exclude>com.google.protobuf.AbstractMessageInternal</exclude>
6061
<exclude>com.google.protobuf.AbstractMessageLite</exclude>
6162
<exclude>com.google.protobuf.AbstractParser</exclude>
6263
<exclude>com.google.protobuf.AbstractProtobufList</exclude>
@@ -122,7 +123,9 @@
122123
<exclude>com.google.protobuf.FloatValue</exclude>
123124
<exclude>com.google.protobuf.FloatValueOrBuilder</exclude>
124125
<exclude>com.google.protobuf.GeneratedMessageInfoFactory</exclude>
126+
<exclude>com.google.protobuf.GeneratedMessageInternal</exclude>
125127
<exclude>com.google.protobuf.GeneratedMessageLite</exclude>
128+
<exclude>com.google.protobuf.GeneratedMessageV3Internal</exclude>
126129
<exclude>com.google.protobuf.InlineMe</exclude>
127130
<exclude>com.google.protobuf.Int32Value</exclude>
128131
<exclude>com.google.protobuf.Int32ValueOrBuilder</exclude>
@@ -185,13 +188,13 @@
185188
<exclude>com.google.protobuf.ProtoSyntax</exclude>
186189
<exclude>com.google.protobuf.RawMessageInfo</exclude>
187190
<exclude>com.google.protobuf.Reader</exclude>
188-
<exclude>com.google.protobuf.RepeatedFieldBuilderV3</exclude>
191+
<exclude>com.google.protobuf.RepeatedFieldBuilderV3Internal</exclude>
189192
<exclude>com.google.protobuf.RopeByteString</exclude>
190193
<exclude>com.google.protobuf.Schema</exclude>
191194
<exclude>com.google.protobuf.SchemaFactory</exclude>
192195
<exclude>com.google.protobuf.SchemaUtil</exclude>
193196
<exclude>com.google.protobuf.SerializedForm</exclude>
194-
<exclude>com.google.protobuf.SingleFieldBuilderV3</exclude>
197+
<exclude>com.google.protobuf.SingleFieldBuilderV3Internal</exclude>
195198
<exclude>com.google.protobuf.SmallSortedMap</exclude>
196199
<exclude>com.google.protobuf.SourceContext</exclude>
197200
<exclude>com.google.protobuf.SourceContextOrBuilder</exclude>
@@ -230,6 +233,7 @@
230233
<exclude>com.google.protobuf.WrappersProto</exclude>
231234
<exclude>com.google.protobuf.Writer</exclude>
232235

236+
<exclude>com.google.protobuf.AbstractMessageInternal$*</exclude>
233237
<exclude>com.google.protobuf.AbstractMessageLite$*</exclude>
234238
<exclude>com.google.protobuf.AbstractParser$*</exclude>
235239
<exclude>com.google.protobuf.AbstractProtobufList$*</exclude>
@@ -295,7 +299,9 @@
295299
<exclude>com.google.protobuf.FloatValue$*</exclude>
296300
<exclude>com.google.protobuf.FloatValueOrBuilder$*</exclude>
297301
<exclude>com.google.protobuf.GeneratedMessageInfoFactory$*</exclude>
302+
<exclude>com.google.protobuf.GeneratedMessageInternal$*</exclude>
298303
<exclude>com.google.protobuf.GeneratedMessageLite$*</exclude>
304+
<exclude>com.google.protobuf.GeneratedMessageV3Internal$*</exclude>
299305
<exclude>com.google.protobuf.InlineMe$*</exclude>
300306
<exclude>com.google.protobuf.Int32Value$*</exclude>
301307
<exclude>com.google.protobuf.Int32ValueOrBuilder$*</exclude>
@@ -358,13 +364,13 @@
358364
<exclude>com.google.protobuf.ProtoSyntax$*</exclude>
359365
<exclude>com.google.protobuf.RawMessageInfo$*</exclude>
360366
<exclude>com.google.protobuf.Reader$*</exclude>
361-
<exclude>com.google.protobuf.RepeatedFieldBuilderV3$*</exclude>
367+
<exclude>com.google.protobuf.RepeatedFieldBuilderV3Internal$*</exclude>
362368
<exclude>com.google.protobuf.RopeByteString$*</exclude>
363369
<exclude>com.google.protobuf.Schema$*</exclude>
364370
<exclude>com.google.protobuf.SchemaFactory$*</exclude>
365371
<exclude>com.google.protobuf.SchemaUtil$*</exclude>
366372
<exclude>com.google.protobuf.SerializedForm$*</exclude>
367-
<exclude>com.google.protobuf.SingleFieldBuilderV3$*</exclude>
373+
<exclude>com.google.protobuf.SingleFieldBuilderV3Internal$*</exclude>
368374
<exclude>com.google.protobuf.SmallSortedMap$*</exclude>
369375
<exclude>com.google.protobuf.SourceContext$*</exclude>
370376
<exclude>com.google.protobuf.SourceContextOrBuilder$*</exclude>

0 commit comments

Comments
 (0)