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

Commit e2af685

Browse files
yangnuoyuyangnuoyu
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#220)
1 parent d1f4972 commit e2af685

File tree

7 files changed

+53
-103
lines changed

7 files changed

+53
-103
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-translate/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -145,4 +145,13 @@
145145
</dependencies>
146146
</profile>
147147
</profiles>
148+
149+
<build>
150+
<plugins>
151+
<plugin>
152+
<groupId>org.codehaus.mojo</groupId>
153+
<artifactId>flatten-maven-plugin</artifactId>
154+
</plugin>
155+
</plugins>
156+
</build>
148157
</project>

‎grpc-google-cloud-translate-v3/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-translate-v3beta1/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

+6-103
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,6 @@
6363
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6464
<github.global.server>github</github.global.server>
6565
<site.installationModule>google-cloud-translate-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.auth.version>0.20.0</google.auth.version>
70-
<google.http-client.version>1.35.0</google.http-client.version>
71-
<gax.version>1.56.0</gax.version>
72-
<grpc.version>1.30.0</grpc.version>
73-
<protobuf.version>3.12.2</protobuf.version>
74-
<junit.version>4.13</junit.version>
75-
<easymock.version>3.6</easymock.version>
76-
<guava.version>29.0-android</guava.version>
77-
<threeten.version>1.4.4</threeten.version>
78-
<javax.annotations.version>1.3.2</javax.annotations.version>
79-
<animal-sniffer.version>1.18</animal-sniffer.version>
80-
<translate-http-client.version>v2-rev20170525-1.30.9</translate-http-client.version>
8166
</properties>
8267

8368
<dependencyManagement>
@@ -108,111 +93,29 @@
10893
<version>1.94.6-SNAPSHOT</version><!-- {x-version-update:google-cloud-translate:current} -->
10994
</dependency>
11095

111-
<dependency>
112-
<groupId>io.grpc</groupId>
113-
<artifactId>grpc-bom</artifactId>
114-
<version>${grpc.version}</version>
115-
<type>pom</type>
116-
<scope>import</scope>
117-
</dependency>
118-
<dependency>
119-
<groupId>com.google.api</groupId>
120-
<artifactId>gax-bom</artifactId>
121-
<version>${gax.version}</version>
122-
<type>pom</type>
123-
<scope>import</scope>
124-
</dependency>
125-
<dependency>
126-
<groupId>com.google.guava</groupId>
127-
<artifactId>guava-bom</artifactId>
128-
<version>${guava.version}</version>
129-
<type>pom</type>
130-
<scope>import</scope>
131-
</dependency>
13296
<dependency>
13397
<groupId>com.google.cloud</groupId>
134-
<artifactId>google-cloud-core-bom</artifactId>
135-
<version>${google.core.version}</version>
136-
<type>pom</type>
137-
<scope>import</scope>
138-
</dependency>
139-
<dependency>
140-
<groupId>com.google.auth</groupId>
141-
<artifactId>google-auth-library-bom</artifactId>
142-
<version>${google.auth.version}</version>
98+
<artifactId>google-cloud-shared-dependencies</artifactId>
99+
<version>0.8.1</version>
143100
<type>pom</type>
144101
<scope>import</scope>
145102
</dependency>
146-
<dependency>
147-
<groupId>com.google.http-client</groupId>
148-
<artifactId>google-http-client-bom</artifactId>
149-
<version>${google.http-client.version}</version>
150-
<type>pom</type>
151-
<scope>import</scope>
152-
</dependency>
153-
<dependency>
154-
<groupId>com.google.protobuf</groupId>
155-
<artifactId>protobuf-bom</artifactId>
156-
<version>${protobuf.version}</version>
157-
<type>pom</type>
158-
<scope>import</scope>
159-
</dependency>
160-
161-
<dependency>
162-
<groupId>com.google.api</groupId>
163-
<artifactId>api-common</artifactId>
164-
<version>${google.api-common.version}</version>
165-
</dependency>
166-
<dependency>
167-
<groupId>com.google.api.grpc</groupId>
168-
<artifactId>proto-google-common-protos</artifactId>
169-
<version>${google.common-protos.version}</version>
170-
</dependency>
171-
<dependency>
172-
<groupId>org.threeten</groupId>
173-
<artifactId>threetenbp</artifactId>
174-
<version>${threeten.version}</version>
175-
</dependency>
176-
<dependency>
177-
<groupId>javax.annotation</groupId>
178-
<artifactId>javax.annotation-api</artifactId>
179-
<version>${javax.annotations.version}</version>
180-
</dependency>
181-
<dependency>
182-
<groupId>org.codehaus.mojo</groupId>
183-
<artifactId>animal-sniffer-annotations</artifactId>
184-
<version>${animal-sniffer.version}</version>
185-
</dependency>
186103
<dependency>
187104
<groupId>com.google.apis</groupId>
188105
<artifactId>google-api-services-translate</artifactId>
189-
<version>${translate-http-client.version}</version>
106+
<version>v2-rev20170525-1.30.9</version>
190107
</dependency>
191108

192109
<dependency>
193110
<groupId>junit</groupId>
194111
<artifactId>junit</artifactId>
195-
<version>${junit.version}</version>
112+
<version>4.13</version>
196113
<scope>test</scope>
197114
</dependency>
198115
<dependency>
199116
<groupId>org.easymock</groupId>
200117
<artifactId>easymock</artifactId>
201-
<version>${easymock.version}</version>
202-
<scope>test</scope>
203-
</dependency>
204-
<dependency>
205-
<groupId>com.google.api</groupId>
206-
<artifactId>gax-grpc</artifactId>
207-
<version>${gax.version}</version>
208-
<classifier>testlib</classifier>
209-
<scope>test</scope>
210-
</dependency>
211-
<dependency>
212-
<groupId>com.google.cloud</groupId>
213-
<artifactId>google-cloud-core</artifactId>
214-
<type>test-jar</type>
215-
<version>${google.core.version}</version>
118+
<version>3.6</version>
216119
<scope>test</scope>
217120
</dependency>
218121
</dependencies>
@@ -304,7 +207,7 @@
304207
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
305208
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
306209
<link>https://googleapis.dev/java/gax/latest/</link>
307-
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
210+
<link>https://googleapis.github.io/api-common-java/</link>
308211
</links>
309212
</configuration>
310213
</plugin>

‎proto-google-cloud-translate-v3/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,13 @@
3030
<artifactId>guava</artifactId>
3131
</dependency>
3232
</dependencies>
33+
34+
<build>
35+
<plugins>
36+
<plugin>
37+
<groupId>org.codehaus.mojo</groupId>
38+
<artifactId>flatten-maven-plugin</artifactId>
39+
</plugin>
40+
</plugins>
41+
</build>
3342
</project>

‎proto-google-cloud-translate-v3beta1/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,13 @@
3030
<artifactId>guava</artifactId>
3131
</dependency>
3232
</dependencies>
33+
34+
<build>
35+
<plugins>
36+
<plugin>
37+
<groupId>org.codehaus.mojo</groupId>
38+
<artifactId>flatten-maven-plugin</artifactId>
39+
</plugin>
40+
</plugins>
41+
</build>
3342
</project>

0 commit comments

Comments
 (0)