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

Commit d1a0e06

Browse files
yangnuoyuyangnuoyu
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#218)
1 parent bf5f2b8 commit d1a0e06

File tree

9 files changed

+71
-75
lines changed

9 files changed

+71
-75
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
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-speech/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,13 @@
111111
</dependencies>
112112
</profile>
113113
</profiles>
114+
115+
<build>
116+
<plugins>
117+
<plugin>
118+
<groupId>org.codehaus.mojo</groupId>
119+
<artifactId>flatten-maven-plugin</artifactId>
120+
</plugin>
121+
</plugins>
122+
</build>
114123
</project>

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

Lines changed: 9 additions & 0 deletions
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-speech-v1beta1/pom.xml‎

Lines changed: 9 additions & 0 deletions
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-speech-v1p1beta1/pom.xml‎

Lines changed: 9 additions & 0 deletions
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‎

Lines changed: 6 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -151,18 +151,6 @@
151151
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
152152
<github.global.server>github</github.global.server>
153153
<site.installationModule>google-cloud-speech-parent</site.installationModule>
154-
<google.core.version>1.93.6</google.core.version>
155-
<google.api-common.version>1.9.2</google.api-common.version>
156-
<google.common-protos.version>1.18.0</google.common-protos.version>
157-
<gax.version>1.57.0</gax.version>
158-
<grpc.version>1.30.0</grpc.version>
159-
<protobuf.version>3.12.2</protobuf.version>
160-
<junit.version>4.13</junit.version>
161-
<guava.version>29.0-android</guava.version>
162-
<threeten.version>1.4.4</threeten.version>
163-
<javax.annotations.version>1.3.2</javax.annotations.version>
164-
<animal-sniffer.version>1.18</animal-sniffer.version>
165-
<errorprone.version>2.4.0</errorprone.version>
166154
</properties>
167155

168156
<dependencyManagement>
@@ -199,79 +187,22 @@
199187
</dependency>
200188

201189
<dependency>
202-
<groupId>io.grpc</groupId>
203-
<artifactId>grpc-bom</artifactId>
204-
<version>${grpc.version}</version>
205-
<type>pom</type>
206-
<scope>import</scope>
207-
</dependency>
208-
<dependency>
209-
<groupId>com.google.api</groupId>
210-
<artifactId>gax-bom</artifactId>
211-
<version>${gax.version}</version>
212-
<type>pom</type>
213-
<scope>import</scope>
214-
</dependency>
215-
<dependency>
216-
<groupId>com.google.guava</groupId>
217-
<artifactId>guava-bom</artifactId>
218-
<version>${guava.version}</version>
190+
<groupId>com.google.cloud</groupId>
191+
<artifactId>google-cloud-shared-dependencies</artifactId>
192+
<version>0.8.1</version>
219193
<type>pom</type>
220194
<scope>import</scope>
221195
</dependency>
222-
223-
<dependency>
224-
<groupId>com.google.cloud</groupId>
225-
<artifactId>google-cloud-core-grpc</artifactId>
226-
<version>${google.core.version}</version>
227-
</dependency>
228-
<dependency>
229-
<groupId>com.google.protobuf</groupId>
230-
<artifactId>protobuf-java</artifactId>
231-
<version>${protobuf.version}</version>
232-
</dependency>
233-
<dependency>
234-
<groupId>com.google.api</groupId>
235-
<artifactId>api-common</artifactId>
236-
<version>${google.api-common.version}</version>
237-
</dependency>
238-
<dependency>
239-
<groupId>com.google.api.grpc</groupId>
240-
<artifactId>proto-google-common-protos</artifactId>
241-
<version>${google.common-protos.version}</version>
242-
</dependency>
243-
<dependency>
244-
<groupId>org.threeten</groupId>
245-
<artifactId>threetenbp</artifactId>
246-
<version>${threeten.version}</version>
247-
</dependency>
248-
<dependency>
249-
<groupId>javax.annotation</groupId>
250-
<artifactId>javax.annotation-api</artifactId>
251-
<version>${javax.annotations.version}</version>
252-
</dependency>
253-
<dependency>
254-
<groupId>org.codehaus.mojo</groupId>
255-
<artifactId>animal-sniffer-annotations</artifactId>
256-
<version>${animal-sniffer.version}</version>
257-
</dependency>
258196
<dependency>
259197
<groupId>com.google.errorprone</groupId>
260198
<artifactId>error_prone_annotations</artifactId>
261-
<version>${errorprone.version}</version>
199+
<version>2.4.0</version>
262200
</dependency>
263201

264202
<dependency>
265203
<groupId>junit</groupId>
266204
<artifactId>junit</artifactId>
267-
<version>${junit.version}</version>
268-
<scope>test</scope>
269-
</dependency>
270-
<dependency>
271-
<groupId>com.google.api</groupId>
272-
<artifactId>gax-grpc</artifactId>
273-
<version>${gax.version}</version>
274-
<classifier>testlib</classifier>
205+
<version>4.13</version>
275206
<scope>test</scope>
276207
</dependency>
277208
<dependency>
@@ -371,7 +302,7 @@
371302
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
372303
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
373304
<link>https://googleapis.dev/java/gax/latest/</link>
374-
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
305+
<link>https://googleapis.github.io/api-common-java/</link>
375306
</links>
376307
</configuration>
377308
</plugin>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,13 @@
2424
<scope>compile</scope>
2525
</dependency>
2626
</dependencies>
27+
28+
<build>
29+
<plugins>
30+
<plugin>
31+
<groupId>org.codehaus.mojo</groupId>
32+
<artifactId>flatten-maven-plugin</artifactId>
33+
</plugin>
34+
</plugins>
35+
</build>
2736
</project>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,13 @@
2424
<scope>compile</scope>
2525
</dependency>
2626
</dependencies>
27+
28+
<build>
29+
<plugins>
30+
<plugin>
31+
<groupId>org.codehaus.mojo</groupId>
32+
<artifactId>flatten-maven-plugin</artifactId>
33+
</plugin>
34+
</plugins>
35+
</build>
2736
</project>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,13 @@
3232
<artifactId>api-common</artifactId>
3333
</dependency>
3434
</dependencies>
35+
36+
<build>
37+
<plugins>
38+
<plugin>
39+
<groupId>org.codehaus.mojo</groupId>
40+
<artifactId>flatten-maven-plugin</artifactId>
41+
</plugin>
42+
</plugins>
43+
</build>
3544
</project>

0 commit comments

Comments
 (0)