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

Commit 093cbc1

Browse files
yangnuoyuyangnuoyu
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#178)
1 parent 7c1548c commit 093cbc1

File tree

7 files changed

+53
-68
lines changed

7 files changed

+53
-68
lines changed

Diff for: ‎.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,6 @@ api_key
4242
# Python utilities
4343
*.pyc
4444
artman-genfiles
45-
venv
45+
venv
46+
47+
.flattened-pom.xml

Diff for: ‎google-cloud-texttospeech/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,13 @@
107107
</dependencies>
108108
</profile>
109109
</profiles>
110+
111+
<build>
112+
<plugins>
113+
<plugin>
114+
<groupId>org.codehaus.mojo</groupId>
115+
<artifactId>flatten-maven-plugin</artifactId>
116+
</plugin>
117+
</plugins>
118+
</build>
110119
</project>

Diff for: ‎grpc-google-cloud-texttospeech-v1/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>

Diff for: ‎grpc-google-cloud-texttospeech-v1beta1/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>

Diff for: ‎pom.xml

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

7868
<dependencyManagement>
@@ -104,69 +94,17 @@
10494
</dependency>
10595

10696
<dependency>
107-
<groupId>io.grpc</groupId>
108-
<artifactId>grpc-bom</artifactId>
109-
<version>${grpc.version}</version>
110-
<type>pom</type>
111-
<scope>import</scope>
112-
</dependency>
113-
<dependency>
114-
<groupId>com.google.api</groupId>
115-
<artifactId>gax-bom</artifactId>
116-
<version>${gax.version}</version>
117-
<type>pom</type>
118-
<scope>import</scope>
119-
</dependency>
120-
<dependency>
121-
<groupId>com.google.guava</groupId>
122-
<artifactId>guava-bom</artifactId>
123-
<version>${guava.version}</version>
97+
<groupId>com.google.cloud</groupId>
98+
<artifactId>google-cloud-shared-dependencies</artifactId>
99+
<version>0.8.1</version>
124100
<type>pom</type>
125101
<scope>import</scope>
126102
</dependency>
127103

128-
<dependency>
129-
<groupId>com.google.protobuf</groupId>
130-
<artifactId>protobuf-java</artifactId>
131-
<version>${protobuf.version}</version>
132-
</dependency>
133-
<dependency>
134-
<groupId>com.google.api</groupId>
135-
<artifactId>api-common</artifactId>
136-
<version>${google.api-common.version}</version>
137-
</dependency>
138-
<dependency>
139-
<groupId>com.google.api.grpc</groupId>
140-
<artifactId>proto-google-common-protos</artifactId>
141-
<version>${google.common-protos.version}</version>
142-
</dependency>
143-
<dependency>
144-
<groupId>org.threeten</groupId>
145-
<artifactId>threetenbp</artifactId>
146-
<version>${threeten.version}</version>
147-
</dependency>
148-
<dependency>
149-
<groupId>javax.annotation</groupId>
150-
<artifactId>javax.annotation-api</artifactId>
151-
<version>${javax.annotations.version}</version>
152-
</dependency>
153-
<dependency>
154-
<groupId>org.codehaus.mojo</groupId>
155-
<artifactId>animal-sniffer-annotations</artifactId>
156-
<version>${animal-sniffer.version}</version>
157-
</dependency>
158-
159104
<dependency>
160105
<groupId>junit</groupId>
161106
<artifactId>junit</artifactId>
162-
<version>${junit.version}</version>
163-
<scope>test</scope>
164-
</dependency>
165-
<dependency>
166-
<groupId>com.google.api</groupId>
167-
<artifactId>gax-grpc</artifactId>
168-
<version>${gax.version}</version>
169-
<classifier>testlib</classifier>
107+
<version>4.13</version>
170108
<scope>test</scope>
171109
</dependency>
172110
</dependencies>
@@ -258,7 +196,7 @@
258196
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
259197
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
260198
<link>https://googleapis.dev/java/gax/latest/</link>
261-
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
199+
<link>https://googleapis.github.io/api-common-java/</link>
262200
</links>
263201
</configuration>
264202
</plugin>

Diff for: ‎proto-google-cloud-texttospeech-v1/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,13 @@
2222
<artifactId>proto-google-common-protos</artifactId>
2323
</dependency>
2424
</dependencies>
25+
26+
<build>
27+
<plugins>
28+
<plugin>
29+
<groupId>org.codehaus.mojo</groupId>
30+
<artifactId>flatten-maven-plugin</artifactId>
31+
</plugin>
32+
</plugins>
33+
</build>
2534
</project>

Diff for: ‎proto-google-cloud-texttospeech-v1beta1/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,13 @@
2222
<artifactId>proto-google-common-protos</artifactId>
2323
</dependency>
2424
</dependencies>
25+
26+
<build>
27+
<plugins>
28+
<plugin>
29+
<groupId>org.codehaus.mojo</groupId>
30+
<artifactId>flatten-maven-plugin</artifactId>
31+
</plugin>
32+
</plugins>
33+
</build>
2534
</project>

0 commit comments

Comments
 (0)