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

Commit db4d292

Browse files
yangnuoyuyangnuoyu
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#187)
1 parent c7ccf99 commit db4d292

File tree

7 files changed

+52
-68
lines changed

7 files changed

+52
-68
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-webrisk/pom.xml

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

‎grpc-google-cloud-webrisk-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>

‎grpc-google-cloud-webrisk-v1beta1/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 & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,6 @@
6363
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6464
<github.global.server>github</github.global.server>
6565
<site.installationModule>google-cloud-webrisk-parent</site.installationModule>
66-
<google.core.version>1.91.1</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.57.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>
7766
</properties>
7867

7968
<dependencyManagement>
@@ -105,69 +94,17 @@
10594
</dependency>
10695

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

129-
<dependency>
130-
<groupId>com.google.protobuf</groupId>
131-
<artifactId>protobuf-java</artifactId>
132-
<version>${protobuf.version}</version>
133-
</dependency>
134-
<dependency>
135-
<groupId>com.google.api</groupId>
136-
<artifactId>api-common</artifactId>
137-
<version>${google.api-common.version}</version>
138-
</dependency>
139-
<dependency>
140-
<groupId>com.google.api.grpc</groupId>
141-
<artifactId>proto-google-common-protos</artifactId>
142-
<version>${google.common-protos.version}</version>
143-
</dependency>
144-
<dependency>
145-
<groupId>org.threeten</groupId>
146-
<artifactId>threetenbp</artifactId>
147-
<version>${threeten.version}</version>
148-
</dependency>
149-
<dependency>
150-
<groupId>javax.annotation</groupId>
151-
<artifactId>javax.annotation-api</artifactId>
152-
<version>${javax.annotations.version}</version>
153-
</dependency>
154-
<dependency>
155-
<groupId>org.codehaus.mojo</groupId>
156-
<artifactId>animal-sniffer-annotations</artifactId>
157-
<version>${animal-sniffer.version}</version>
158-
</dependency>
159-
160104
<dependency>
161105
<groupId>junit</groupId>
162106
<artifactId>junit</artifactId>
163-
<version>${junit.version}</version>
164-
<scope>test</scope>
165-
</dependency>
166-
<dependency>
167-
<groupId>com.google.api</groupId>
168-
<artifactId>gax-grpc</artifactId>
169-
<version>${gax.version}</version>
170-
<classifier>testlib</classifier>
107+
<version>4.13</version>
171108
<scope>test</scope>
172109
</dependency>
173110
</dependencies>
@@ -259,7 +196,7 @@
259196
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
260197
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
261198
<link>https://googleapis.dev/java/gax/latest/</link>
262-
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
199+
<link>https://googleapis.github.io/api-common-java/</link>
263200
</links>
264201
</configuration>
265202
</plugin>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,13 @@
3030
<artifactId>api-common</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-webrisk-v1beta1/pom.xml

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