Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 504f871

Browse files
yangnuoyuyangnuoyu
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#220)
1 parent 7949ef6 commit 504f871

File tree

13 files changed

+106
-79
lines changed

13 files changed

+106
-79
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ target/
1313
# python utilities
1414
*.pyc
1515
__pycache__
16+
17+
.flattened-pom.xml

‎google-cloud-asset/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -153,4 +153,13 @@
153153
</dependencies>
154154
</profile>
155155
</profiles>
156+
157+
<build>
158+
<plugins>
159+
<plugin>
160+
<groupId>org.codehaus.mojo</groupId>
161+
<artifactId>flatten-maven-plugin</artifactId>
162+
</plugin>
163+
</plugins>
164+
</build>
156165
</project>

‎grpc-google-cloud-asset-v1/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,13 @@
5757
</dependencies>
5858
</profile>
5959
</profiles>
60+
61+
<build>
62+
<plugins>
63+
<plugin>
64+
<groupId>org.codehaus.mojo</groupId>
65+
<artifactId>flatten-maven-plugin</artifactId>
66+
</plugin>
67+
</plugins>
68+
</build>
6069
</project>

‎grpc-google-cloud-asset-v1beta1/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,13 @@
5757
</dependencies>
5858
</profile>
5959
</profiles>
60+
61+
<build>
62+
<plugins>
63+
<plugin>
64+
<groupId>org.codehaus.mojo</groupId>
65+
<artifactId>flatten-maven-plugin</artifactId>
66+
</plugin>
67+
</plugins>
68+
</build>
6069
</project>

‎grpc-google-cloud-asset-v1p1beta1/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,13 @@
5353
</dependencies>
5454
</profile>
5555
</profiles>
56+
57+
<build>
58+
<plugins>
59+
<plugin>
60+
<groupId>org.codehaus.mojo</groupId>
61+
<artifactId>flatten-maven-plugin</artifactId>
62+
</plugin>
63+
</plugins>
64+
</build>
5665
</project>

‎grpc-google-cloud-asset-v1p2beta1/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,13 @@
5353
</dependencies>
5454
</profile>
5555
</profiles>
56+
57+
<build>
58+
<plugins>
59+
<plugin>
60+
<groupId>org.codehaus.mojo</groupId>
61+
<artifactId>flatten-maven-plugin</artifactId>
62+
</plugin>
63+
</plugins>
64+
</build>
5665
</project>

‎grpc-google-cloud-asset-v1p4beta1/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,13 @@
5757
</dependencies>
5858
</profile>
5959
</profiles>
60+
61+
<build>
62+
<plugins>
63+
<plugin>
64+
<groupId>org.codehaus.mojo</groupId>
65+
<artifactId>flatten-maven-plugin</artifactId>
66+
</plugin>
67+
</plugins>
68+
</build>
6069
</project>

‎pom.xml

+5-79
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,6 @@
6363
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6464
<github.global.server>github</github.global.server>
6565
<site.installationModule>google-cloud-asset-parent</site.installationModule>
66-
<google.core.version>1.93.5</google.core.version>
67-
<google.api-common.version>1.9.2</google.api-common.version>
68-
<google.common-protos.version>1.18.0</google.common-protos.version>
69-
<google.iam.version>0.13.0</google.iam.version>
70-
<gax.version>1.56.0</gax.version>
71-
<grpc.version>1.30.0</grpc.version>
72-
<protobuf.version>3.12.2</protobuf.version>
73-
<junit.version>4.13</junit.version>
74-
<guava.version>29.0-android</guava.version>
75-
<threeten.version>1.4.4</threeten.version>
76-
<javax.annotations.version>1.3.2</javax.annotations.version>
77-
<animal-sniffer.version>1.18</animal-sniffer.version>
7866
</properties>
7967

8068
<dependencyManagement>
@@ -136,67 +124,12 @@
136124
</dependency>
137125

138126
<dependency>
139-
<groupId>io.grpc</groupId>
140-
<artifactId>grpc-bom</artifactId>
141-
<version>${grpc.version}</version>
142-
<type>pom</type>
143-
<scope>import</scope>
144-
</dependency>
145-
<dependency>
146-
<groupId>com.google.api</groupId>
147-
<artifactId>gax-bom</artifactId>
148-
<version>${gax.version}</version>
149-
<type>pom</type>
150-
<scope>import</scope>
151-
</dependency>
152-
<dependency>
153-
<groupId>com.google.guava</groupId>
154-
<artifactId>guava-bom</artifactId>
155-
<version>${guava.version}</version>
127+
<groupId>com.google.cloud</groupId>
128+
<artifactId>google-cloud-shared-dependencies</artifactId>
129+
<version>0.8.1</version>
156130
<type>pom</type>
157131
<scope>import</scope>
158132
</dependency>
159-
160-
<dependency>
161-
<groupId>com.google.protobuf</groupId>
162-
<artifactId>protobuf-java</artifactId>
163-
<version>${protobuf.version}</version>
164-
</dependency>
165-
<dependency>
166-
<groupId>com.google.api</groupId>
167-
<artifactId>api-common</artifactId>
168-
<version>${google.api-common.version}</version>
169-
</dependency>
170-
<dependency>
171-
<groupId>com.google.api.grpc</groupId>
172-
<artifactId>proto-google-common-protos</artifactId>
173-
<version>${google.common-protos.version}</version>
174-
</dependency>
175-
<dependency>
176-
<groupId>com.google.cloud</groupId>
177-
<artifactId>google-cloud-core</artifactId>
178-
<version>${google.core.version}</version>
179-
</dependency>
180-
<dependency>
181-
<groupId>com.google.api.grpc</groupId>
182-
<artifactId>proto-google-iam-v1</artifactId>
183-
<version>${google.iam.version}</version>
184-
</dependency>
185-
<dependency>
186-
<groupId>org.threeten</groupId>
187-
<artifactId>threetenbp</artifactId>
188-
<version>${threeten.version}</version>
189-
</dependency>
190-
<dependency>
191-
<groupId>javax.annotation</groupId>
192-
<artifactId>javax.annotation-api</artifactId>
193-
<version>${javax.annotations.version}</version>
194-
</dependency>
195-
<dependency>
196-
<groupId>org.codehaus.mojo</groupId>
197-
<artifactId>animal-sniffer-annotations</artifactId>
198-
<version>${animal-sniffer.version}</version>
199-
</dependency>
200133
<dependency>
201134
<groupId>com.google.api.grpc</groupId>
202135
<artifactId>proto-google-cloud-orgpolicy-v1</artifactId>
@@ -211,7 +144,7 @@
211144
<dependency>
212145
<groupId>junit</groupId>
213146
<artifactId>junit</artifactId>
214-
<version>${junit.version}</version>
147+
<version>4.13</version>
215148
<scope>test</scope>
216149
</dependency>
217150
<dependency>
@@ -232,13 +165,6 @@
232165
<version>0.117.2-alpha</version>
233166
<scope>test</scope>
234167
</dependency>
235-
<dependency>
236-
<groupId>com.google.api</groupId>
237-
<artifactId>gax-grpc</artifactId>
238-
<version>${gax.version}</version>
239-
<classifier>testlib</classifier>
240-
<scope>test</scope>
241-
</dependency>
242168
</dependencies>
243169
</dependencyManagement>
244170

@@ -334,7 +260,7 @@
334260
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
335261
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
336262
<link>https://googleapis.dev/java/gax/latest/</link>
337-
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
263+
<link>https://googleapis.github.io/api-common-java/</link>
338264
</links>
339265
</configuration>
340266
</plugin>

‎proto-google-cloud-asset-v1/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,13 @@
4242
<artifactId>proto-google-identity-accesscontextmanager-v1</artifactId>
4343
</dependency>
4444
</dependencies>
45+
46+
<build>
47+
<plugins>
48+
<plugin>
49+
<groupId>org.codehaus.mojo</groupId>
50+
<artifactId>flatten-maven-plugin</artifactId>
51+
</plugin>
52+
</plugins>
53+
</build>
4554
</project>

‎proto-google-cloud-asset-v1beta1/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,13 @@
3434
<artifactId>proto-google-iam-v1</artifactId>
3535
</dependency>
3636
</dependencies>
37+
38+
<build>
39+
<plugins>
40+
<plugin>
41+
<groupId>org.codehaus.mojo</groupId>
42+
<artifactId>flatten-maven-plugin</artifactId>
43+
</plugin>
44+
</plugins>
45+
</build>
3746
</project>

‎proto-google-cloud-asset-v1p1beta1/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,13 @@
2626
<artifactId>proto-google-iam-v1</artifactId>
2727
</dependency>
2828
</dependencies>
29+
30+
<build>
31+
<plugins>
32+
<plugin>
33+
<groupId>org.codehaus.mojo</groupId>
34+
<artifactId>flatten-maven-plugin</artifactId>
35+
</plugin>
36+
</plugins>
37+
</build>
2938
</project>

‎proto-google-cloud-asset-v1p2beta1/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,13 @@
3434
<artifactId>proto-google-iam-v1</artifactId>
3535
</dependency>
3636
</dependencies>
37+
38+
<build>
39+
<plugins>
40+
<plugin>
41+
<groupId>org.codehaus.mojo</groupId>
42+
<artifactId>flatten-maven-plugin</artifactId>
43+
</plugin>
44+
</plugins>
45+
</build>
3746
</project>

‎proto-google-cloud-asset-v1p4beta1/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,13 @@
2626
<artifactId>proto-google-iam-v1</artifactId>
2727
</dependency>
2828
</dependencies>
29+
30+
<build>
31+
<plugins>
32+
<plugin>
33+
<groupId>org.codehaus.mojo</groupId>
34+
<artifactId>flatten-maven-plugin</artifactId>
35+
</plugin>
36+
</plugins>
37+
</build>
2938
</project>

0 commit comments

Comments
 (0)