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

Commit 4dbf4db

Browse files
yangnuoyuyangnuoyu
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#203)
1 parent 272e261 commit 4dbf4db

5 files changed

Lines changed: 35 additions & 106 deletions

File tree

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
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

‎google-cloud-kms/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,4 +124,13 @@
124124
</dependencies>
125125
</profile>
126126
</profiles>
127+
128+
<build>
129+
<plugins>
130+
<plugin>
131+
<groupId>org.codehaus.mojo</groupId>
132+
<artifactId>flatten-maven-plugin</artifactId>
133+
</plugin>
134+
</plugins>
135+
</build>
127136
</project>

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

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

‎pom.xml‎

Lines changed: 5 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,6 @@
6363
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6464
<github.global.server>github</github.global.server>
6565
<site.installationModule>google-cloud-kms-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-
<gax.version>1.56.0</gax.version>
70-
<grpc.version>1.30.0</grpc.version>
71-
<protobuf.version>3.12.2</protobuf.version>
72-
<junit.version>4.13</junit.version>
73-
<guava.version>29.0-android</guava.version>
74-
<threeten.version>1.4.4</threeten.version>
75-
<javax.annotations.version>1.3.2</javax.annotations.version>
76-
<animal-sniffer.version>1.18</animal-sniffer.version>
77-
<google.auth.version>0.20.0</google.auth.version>
78-
<http-client-bom.version>1.35.0</http-client-bom.version>
79-
<google.proto-iam-v1.version>0.13.0</google.proto-iam-v1.version>
8066
</properties>
8167

8268
<dependencyManagement>
@@ -103,103 +89,17 @@
10389
</dependency>
10490

10591
<dependency>
106-
<groupId>io.grpc</groupId>
107-
<artifactId>grpc-bom</artifactId>
108-
<version>${grpc.version}</version>
109-
<type>pom</type>
110-
<scope>import</scope>
111-
</dependency>
112-
<dependency>
113-
<groupId>com.google.api</groupId>
114-
<artifactId>gax-bom</artifactId>
115-
<version>${gax.version}</version>
116-
<type>pom</type>
117-
<scope>import</scope>
118-
</dependency>
119-
<dependency>
120-
<groupId>com.google.guava</groupId>
121-
<artifactId>guava-bom</artifactId>
122-
<version>${guava.version}</version>
123-
<type>pom</type>
124-
<scope>import</scope>
125-
</dependency>
126-
<dependency>
127-
<groupId>com.google.http-client</groupId>
128-
<artifactId>google-http-client-bom</artifactId>
129-
<version>${http-client-bom.version}</version>
130-
<type>pom</type>
131-
<scope>import</scope>
132-
</dependency>
133-
<dependency>
134-
<groupId>com.google.auth</groupId>
135-
<artifactId>google-auth-library-bom</artifactId>
136-
<version>${google.auth.version}</version>
92+
<groupId>com.google.cloud</groupId>
93+
<artifactId>google-cloud-shared-dependencies</artifactId>
94+
<version>0.8.1</version>
13795
<type>pom</type>
13896
<scope>import</scope>
13997
</dependency>
14098

141-
<dependency>
142-
<groupId>com.google.protobuf</groupId>
143-
<artifactId>protobuf-java</artifactId>
144-
<version>${protobuf.version}</version>
145-
</dependency>
146-
<dependency>
147-
<groupId>com.google.api</groupId>
148-
<artifactId>api-common</artifactId>
149-
<version>${google.api-common.version}</version>
150-
</dependency>
151-
<dependency>
152-
<groupId>com.google.api.grpc</groupId>
153-
<artifactId>proto-google-common-protos</artifactId>
154-
<version>${google.common-protos.version}</version>
155-
</dependency>
156-
<dependency>
157-
<groupId>org.threeten</groupId>
158-
<artifactId>threetenbp</artifactId>
159-
<version>${threeten.version}</version>
160-
</dependency>
161-
<dependency>
162-
<groupId>javax.annotation</groupId>
163-
<artifactId>javax.annotation-api</artifactId>
164-
<version>${javax.annotations.version}</version>
165-
</dependency>
166-
<dependency>
167-
<groupId>org.codehaus.mojo</groupId>
168-
<artifactId>animal-sniffer-annotations</artifactId>
169-
<version>${animal-sniffer.version}</version>
170-
</dependency>
171-
<dependency>
172-
<groupId>com.google.api.grpc</groupId>
173-
<artifactId>grpc-google-iam-v1</artifactId>
174-
<version>0.13.0</version>
175-
</dependency>
176-
<dependency>
177-
<groupId>com.google.code.gson</groupId>
178-
<artifactId>gson</artifactId>
179-
<version>2.8.6</version>
180-
</dependency>
181-
<dependency>
182-
<groupId>com.google.api.grpc</groupId>
183-
<artifactId>proto-google-iam-v1</artifactId>
184-
<version>${google.proto-iam-v1.version}</version>
185-
</dependency>
18699
<dependency>
187100
<groupId>junit</groupId>
188101
<artifactId>junit</artifactId>
189-
<version>${junit.version}</version>
190-
<scope>test</scope>
191-
</dependency>
192-
<dependency>
193-
<groupId>com.google.api</groupId>
194-
<artifactId>gax-grpc</artifactId>
195-
<version>${gax.version}</version>
196-
<classifier>testlib</classifier>
197-
<scope>test</scope>
198-
</dependency>
199-
<dependency>
200-
<groupId>com.google.cloud</groupId>
201-
<artifactId>google-cloud-core</artifactId>
202-
<version>${google.core.version}</version>
102+
<version>4.13</version>
203103
<scope>test</scope>
204104
</dependency>
205105
</dependencies>
@@ -289,7 +189,7 @@
289189
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
290190
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
291191
<link>https://googleapis.dev/java/gax/latest/</link>
292-
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
192+
<link>https://googleapis.github.io/api-common-java/</link>
293193
</links>
294194
</configuration>
295195
</plugin>

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

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