Skip to content

Commit 3817a1d

Browse files
lqiu96lqiu96
committed
chore: Rename name to protobuf-shading-within-module
1 parent dd8a169 commit 3817a1d

File tree

28 files changed

+706
-706
lines changed

28 files changed

+706
-706
lines changed

‎coverage-report/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@
3131
<dependency>
3232
<groupId>com.google.api</groupId>
3333
<artifactId>gax</artifactId>
34-
<version>protobuf-shading-v1</version> <!-- {x-version-update:gax:current} -->
34+
<version>protobuf-shading-within-module</version> <!-- {x-version-update:gax:current} -->
3535
</dependency>
3636
<dependency>
3737
<groupId>com.google.api</groupId>
3838
<artifactId>gax-grpc</artifactId>
39-
<version>protobuf-shading-v1</version> <!-- {x-version-update:gax-grpc:current} -->
39+
<version>protobuf-shading-within-module</version> <!-- {x-version-update:gax-grpc:current} -->
4040
</dependency>
4141
<dependency>
4242
<groupId>com.google.api</groupId>
4343
<artifactId>gax-httpjson</artifactId>
44-
<version>protobuf-shading-v1</version> <!-- {x-version-update:gax:current} -->
44+
<version>protobuf-shading-within-module</version> <!-- {x-version-update:gax:current} -->
4545
</dependency>
4646
<dependency>
4747
<groupId>com.google.api</groupId>

‎gapic-generator-java-bom/pom.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<dependency>
8181
<groupId>com.google.api</groupId>
8282
<artifactId>gax-bom</artifactId>
83-
<version>protobuf-shading-v1</version><!-- {x-version-update:gax:current} -->
83+
<version>protobuf-shading-within-module</version><!-- {x-version-update:gax:current} -->
8484
<type>pom</type>
8585
<scope>import</scope>
8686
</dependency>
@@ -92,44 +92,44 @@
9292
<dependency>
9393
<groupId>com.google.api.grpc</groupId>
9494
<artifactId>grpc-google-common-protos</artifactId>
95-
<version>protobuf-shading-v1</version><!-- {x-version-update:proto-google-common-protos:current} -->
95+
<version>protobuf-shading-within-module</version><!-- {x-version-update:proto-google-common-protos:current} -->
9696
</dependency>
9797
<dependency>
9898
<groupId>com.google.api.grpc</groupId>
9999
<artifactId>proto-google-common-protos</artifactId>
100-
<version>protobuf-shading-v1</version><!-- {x-version-update:proto-google-common-protos:current} -->
100+
<version>protobuf-shading-within-module</version><!-- {x-version-update:proto-google-common-protos:current} -->
101101
</dependency>
102102
<dependency>
103103
<groupId>com.google.api.grpc</groupId>
104104
<artifactId>proto-google-iam-v1</artifactId>
105-
<version>protobuf-shading-v1</version><!-- {x-version-update:proto-google-iam-v1:current} -->
105+
<version>protobuf-shading-within-module</version><!-- {x-version-update:proto-google-iam-v1:current} -->
106106
</dependency>
107107
<dependency>
108108
<groupId>com.google.api.grpc</groupId>
109109
<artifactId>proto-google-iam-v2</artifactId>
110-
<version>protobuf-shading-v1</version><!-- {x-version-update:proto-google-iam-v2:current} -->
110+
<version>protobuf-shading-within-module</version><!-- {x-version-update:proto-google-iam-v2:current} -->
111111
</dependency>
112112
<dependency>
113113
<groupId>com.google.api.grpc</groupId>
114114
<artifactId>proto-google-iam-v2beta</artifactId>
115-
<version>protobuf-shading-v1</version><!-- {x-version-update:proto-google-iam-v2beta:current} -->
115+
<version>protobuf-shading-within-module</version><!-- {x-version-update:proto-google-iam-v2beta:current} -->
116116
</dependency>
117117

118118
<!-- Following test deps are kept to keep them consistent with versions above -->
119119
<dependency>
120120
<groupId>com.google.api.grpc</groupId>
121121
<artifactId>grpc-google-iam-v1</artifactId>
122-
<version>protobuf-shading-v1</version><!-- {x-version-update:grpc-google-iam-v1:current} -->
122+
<version>protobuf-shading-within-module</version><!-- {x-version-update:grpc-google-iam-v1:current} -->
123123
</dependency>
124124
<dependency>
125125
<groupId>com.google.api.grpc</groupId>
126126
<artifactId>grpc-google-iam-v2</artifactId>
127-
<version>protobuf-shading-v1</version><!-- {x-version-update:grpc-google-iam-v2:current} -->
127+
<version>protobuf-shading-within-module</version><!-- {x-version-update:grpc-google-iam-v2:current} -->
128128
</dependency>
129129
<dependency>
130130
<groupId>com.google.api.grpc</groupId>
131131
<artifactId>grpc-google-iam-v2beta</artifactId>
132-
<version>protobuf-shading-v1</version><!-- {x-version-update:grpc-google-iam-v2beta:current} -->
132+
<version>protobuf-shading-within-module</version><!-- {x-version-update:grpc-google-iam-v2beta:current} -->
133133
</dependency>
134134
</dependencies>
135135

‎gapic-generator-java/pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -387,41 +387,41 @@
387387
<dependency>
388388
<groupId>com.google.api</groupId>
389389
<artifactId>gax</artifactId>
390-
<version>protobuf-shading-v1</version>
390+
<version>protobuf-shading-within-module</version>
391391
</dependency>
392392
<dependency>
393393
<groupId>com.google.api</groupId>
394394
<artifactId>gax</artifactId>
395395
<!-- import the test code, https://maven.apache.org/plugins/maven-jar-plugin/examples/create-test-jar.html -->
396396
<type>test-jar</type>
397397
<classifier>testlib</classifier>
398-
<version>protobuf-shading-v1</version>
398+
<version>protobuf-shading-within-module</version>
399399
</dependency>
400400
<dependency>
401401
<groupId>com.google.api</groupId>
402402
<artifactId>gax-grpc</artifactId>
403-
<version>protobuf-shading-v1</version>
403+
<version>protobuf-shading-within-module</version>
404404
</dependency>
405405
<dependency>
406406
<groupId>com.google.api</groupId>
407407
<artifactId>gax-grpc</artifactId>
408408
<!-- import the test code, https://maven.apache.org/plugins/maven-jar-plugin/examples/create-test-jar.html -->
409409
<type>test-jar</type>
410410
<classifier>testlib</classifier>
411-
<version>protobuf-shading-v1</version>
411+
<version>protobuf-shading-within-module</version>
412412
</dependency>
413413
<dependency>
414414
<groupId>com.google.api</groupId>
415415
<artifactId>gax-httpjson</artifactId>
416-
<version>protobuf-shading-v1</version>
416+
<version>protobuf-shading-within-module</version>
417417
</dependency>
418418
<dependency>
419419
<groupId>com.google.api</groupId>
420420
<artifactId>gax-httpjson</artifactId>
421421
<!-- import the test code, https://maven.apache.org/plugins/maven-jar-plugin/examples/create-test-jar.html -->
422422
<type>test-jar</type>
423423
<classifier>testlib</classifier>
424-
<version>protobuf-shading-v1</version>
424+
<version>protobuf-shading-within-module</version>
425425
</dependency>
426426
<dependency>
427427
<groupId>com.google.auto.value</groupId>
@@ -459,7 +459,7 @@
459459
<dependency>
460460
<groupId>org.example</groupId>
461461
<artifactId>protobuf-sdk</artifactId>
462-
<version>latest-1.0-SNAPSHOT</version>
462+
<version>1.0-SNAPSHOT</version>
463463
</dependency>
464464
<dependency>
465465
<groupId>org.yaml</groupId>

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.api</groupId>
55
<artifactId>gax-bom</artifactId>
6-
<version>protobuf-shading-v1</version><!-- {x-version-update:gax:current} -->
6+
<version>protobuf-shading-within-module</version><!-- {x-version-update:gax:current} -->
77
<packaging>pom</packaging>
88
<name>GAX (Google Api eXtensions) for Java (BOM)</name>
99
<description>Google Api eXtensions for Java (BOM)</description>
@@ -43,55 +43,55 @@
4343
<dependency>
4444
<groupId>com.google.api</groupId>
4545
<artifactId>gax</artifactId>
46-
<version>protobuf-shading-v1</version><!-- {x-version-update:gax:current} -->
46+
<version>protobuf-shading-within-module</version><!-- {x-version-update:gax:current} -->
4747
</dependency>
4848
<dependency>
4949
<groupId>com.google.api</groupId>
5050
<artifactId>gax</artifactId>
51-
<version>protobuf-shading-v1</version><!-- {x-version-update:gax:current} -->
51+
<version>protobuf-shading-within-module</version><!-- {x-version-update:gax:current} -->
5252
<type>test-jar</type>
5353
<classifier>testlib</classifier>
5454
</dependency>
5555
<dependency>
5656
<groupId>com.google.api</groupId>
5757
<artifactId>gax</artifactId>
58-
<version>protobuf-shading-v1</version><!-- {x-version-update:gax:current} -->
58+
<version>protobuf-shading-within-module</version><!-- {x-version-update:gax:current} -->
5959
<classifier>testlib</classifier>
6060
</dependency>
6161
<dependency>
6262
<groupId>com.google.api</groupId>
6363
<artifactId>gax-grpc</artifactId>
64-
<version>protobuf-shading-v1</version><!-- {x-version-update:gax-grpc:current} -->
64+
<version>protobuf-shading-within-module</version><!-- {x-version-update:gax-grpc:current} -->
6565
</dependency>
6666
<dependency>
6767
<groupId>com.google.api</groupId>
6868
<artifactId>gax-grpc</artifactId>
69-
<version>protobuf-shading-v1</version><!-- {x-version-update:gax-grpc:current} -->
69+
<version>protobuf-shading-within-module</version><!-- {x-version-update:gax-grpc:current} -->
7070
<type>test-jar</type>
7171
<classifier>testlib</classifier>
7272
</dependency>
7373
<dependency>
7474
<groupId>com.google.api</groupId>
7575
<artifactId>gax-grpc</artifactId>
76-
<version>protobuf-shading-v1</version><!-- {x-version-update:gax-grpc:current} -->
76+
<version>protobuf-shading-within-module</version><!-- {x-version-update:gax-grpc:current} -->
7777
<classifier>testlib</classifier>
7878
</dependency>
7979
<dependency>
8080
<groupId>com.google.api</groupId>
8181
<artifactId>gax-httpjson</artifactId>
82-
<version>protobuf-shading-v1</version><!-- {x-version-update:gax:current} -->
82+
<version>protobuf-shading-within-module</version><!-- {x-version-update:gax:current} -->
8383
</dependency>
8484
<dependency>
8585
<groupId>com.google.api</groupId>
8686
<artifactId>gax-httpjson</artifactId>
87-
<version>protobuf-shading-v1</version><!-- {x-version-update:gax:current} -->
87+
<version>protobuf-shading-within-module</version><!-- {x-version-update:gax:current} -->
8888
<type>test-jar</type>
8989
<classifier>testlib</classifier>
9090
</dependency>
9191
<dependency>
9292
<groupId>com.google.api</groupId>
9393
<artifactId>gax-httpjson</artifactId>
94-
<version>protobuf-shading-v1</version><!-- {x-version-update:gax:current} -->
94+
<version>protobuf-shading-within-module</version><!-- {x-version-update:gax:current} -->
9595
<classifier>testlib</classifier>
9696
</dependency>
9797
</dependencies>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<artifactId>gax-grpc</artifactId>
6-
<version>protobuf-shading-v1</version><!-- {x-version-update:gax-grpc:current} -->
6+
<version>protobuf-shading-within-module</version><!-- {x-version-update:gax-grpc:current} -->
77
<packaging>jar</packaging>
88
<name>GAX (Google Api eXtensions) for Java (gRPC)</name>
99
<description>Google Api eXtensions for Java (gRPC)</description>
1010

1111
<parent>
1212
<groupId>com.google.api</groupId>
1313
<artifactId>gax-parent</artifactId>
14-
<version>protobuf-shading-v1</version><!-- {x-version-update:gax:current} -->
14+
<version>protobuf-shading-within-module</version><!-- {x-version-update:gax:current} -->
1515
</parent>
1616

1717
<dependencies>
@@ -26,12 +26,12 @@
2626
<dependency>
2727
<groupId>org.example</groupId>
2828
<artifactId>protobuf-api</artifactId>
29-
<version>latest-1.0-SNAPSHOT</version>
29+
<version>1.0-SNAPSHOT</version>
3030
</dependency>
3131
<dependency>
3232
<groupId>com.google.api.grpc</groupId>
3333
<artifactId>proto-google-common-protos</artifactId>
34-
<version>protobuf-shading-v1</version>
34+
<version>protobuf-shading-within-module</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>com.google.auth</groupId>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<artifactId>gax-httpjson</artifactId>
6-
<version>protobuf-shading-v1</version> <!-- {x-version-update:gax:current} -->
6+
<version>protobuf-shading-within-module</version> <!-- {x-version-update:gax:current} -->
77
<packaging>jar</packaging>
88
<name>GAX (Google Api eXtensions) for Java (HTTP JSON)</name>
99
<description>Google Api eXtensions for Java (HTTP JSON)</description>
1010

1111
<parent>
1212
<groupId>com.google.api</groupId>
1313
<artifactId>gax-parent</artifactId>
14-
<version>protobuf-shading-v1</version><!-- {x-version-update:gax:current} -->
14+
<version>protobuf-shading-within-module</version><!-- {x-version-update:gax:current} -->
1515
</parent>
1616

1717
<properties>
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.google.api.grpc</groupId>
3333
<artifactId>proto-google-common-protos</artifactId>
34-
<version>protobuf-shading-v1</version>
34+
<version>protobuf-shading-within-module</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>com.google.auth</groupId>
@@ -56,7 +56,7 @@
5656
<dependency>
5757
<groupId>org.example</groupId>
5858
<artifactId>protobuf-api</artifactId>
59-
<version>latest-1.0-SNAPSHOT</version>
59+
<version>1.0-SNAPSHOT</version>
6060
</dependency>
6161
<dependency>
6262
<groupId>org.threeten</groupId>

‎gax-java/gax/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<artifactId>gax</artifactId>
6-
<version>protobuf-shading-v1</version><!-- {x-version-update:gax:current} -->
6+
<version>protobuf-shading-within-module</version><!-- {x-version-update:gax:current} -->
77
<packaging>jar</packaging>
88
<name>GAX (Google Api eXtensions) for Java (Core)</name>
99
<description>Google Api eXtensions for Java (Core)</description>
1010

1111
<parent>
1212
<groupId>com.google.api</groupId>
1313
<artifactId>gax-parent</artifactId>
14-
<version>protobuf-shading-v1</version><!-- {x-version-update:gax:current} -->
14+
<version>protobuf-shading-within-module</version><!-- {x-version-update:gax:current} -->
1515
</parent>
1616

1717
<properties>
@@ -33,7 +33,7 @@
3333
<dependency>
3434
<groupId>com.google.api.grpc</groupId>
3535
<artifactId>proto-google-common-protos</artifactId>
36-
<version>protobuf-shading-v1</version>
36+
<version>protobuf-shading-within-module</version>
3737
</dependency>
3838
<!-- <dependency>-->
3939
<!-- <groupId>com.google.protobuf</groupId>-->
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>org.example</groupId>
4444
<artifactId>protobuf-api</artifactId>
45-
<version>latest-1.0-SNAPSHOT</version>
45+
<version>1.0-SNAPSHOT</version>
4646
</dependency>
4747
<dependency>
4848
<groupId>com.google.protobuf</groupId>

‎gax-java/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.google.api</groupId>
55
<artifactId>gax-parent</artifactId>
66
<packaging>pom</packaging>
7-
<version>protobuf-shading-v1</version><!-- {x-version-update:gax:current} -->
7+
<version>protobuf-shading-within-module</version><!-- {x-version-update:gax:current} -->
88
<name>GAX (Google Api eXtensions) for Java (Parent)</name>
99
<description>Google Api eXtensions for Java (Parent)</description>
1010

@@ -98,24 +98,24 @@
9898
<dependency>
9999
<groupId>com.google.api</groupId>
100100
<artifactId>gax</artifactId>
101-
<version>protobuf-shading-v1</version> <!-- {x-version-update:gax:current} -->
101+
<version>protobuf-shading-within-module</version> <!-- {x-version-update:gax:current} -->
102102
</dependency>
103103
<dependency>
104104
<groupId>com.google.api</groupId>
105105
<artifactId>gax</artifactId>
106-
<version>protobuf-shading-v1</version> <!-- {x-version-update:gax:current} -->
106+
<version>protobuf-shading-within-module</version> <!-- {x-version-update:gax:current} -->
107107
<type>test-jar</type>
108108
<classifier>testlib</classifier>
109109
</dependency>
110110
<dependency>
111111
<groupId>com.google.api.grpc</groupId>
112112
<artifactId>proto-google-common-protos</artifactId>
113-
<version>protobuf-shading-v1</version><!-- {x-version-update:proto-google-common-protos:current} -->
113+
<version>protobuf-shading-within-module</version><!-- {x-version-update:proto-google-common-protos:current} -->
114114
</dependency>
115115
<dependency>
116116
<groupId>com.google.api.grpc</groupId>
117117
<artifactId>grpc-google-common-protos</artifactId>
118-
<version>protobuf-shading-v1</version><!-- {x-version-update:grpc-google-common-protos:current} -->
118+
<version>protobuf-shading-within-module</version><!-- {x-version-update:grpc-google-common-protos:current} -->
119119
</dependency>
120120
<dependency>
121121
<groupId>io.grpc</groupId>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.google.api.grpc</groupId>
66
<artifactId>grpc-google-common-protos</artifactId>
7-
<version>protobuf-shading-v1</version><!-- {x-version-update:proto-google-common-protos:current} -->
7+
<version>protobuf-shading-within-module</version><!-- {x-version-update:proto-google-common-protos:current} -->
88
<name>grpc-google-common-protos</name>
99
<description>GRPC library for grpc-google-common-protos</description>
1010
<parent>
1111
<groupId>com.google.api.grpc</groupId>
1212
<artifactId>google-common-protos-parent</artifactId>
13-
<version>protobuf-shading-v1</version><!-- {x-version-update:proto-google-common-protos:current} -->
13+
<version>protobuf-shading-within-module</version><!-- {x-version-update:proto-google-common-protos:current} -->
1414
</parent>
1515
<dependencies>
1616
<dependency>
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>org.example</groupId>
4444
<artifactId>protobuf-api</artifactId>
45-
<version>latest-1.0-SNAPSHOT</version>
45+
<version>1.0-SNAPSHOT</version>
4646
</dependency>
4747
<dependency>
4848
<groupId>com.google.guava</groupId>

0 commit comments

Comments
 (0)