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

Commit 8039912

Browse files
yangnuoyuyangnuoyu
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#212)
1 parent a4fa8f9 commit 8039912

File tree

5 files changed

+34
-68
lines changed

5 files changed

+34
-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-dlp/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,13 @@
9898
</dependencies>
9999
</profile>
100100
</profiles>
101+
102+
<build>
103+
<plugins>
104+
<plugin>
105+
<groupId>org.codehaus.mojo</groupId>
106+
<artifactId>flatten-maven-plugin</artifactId>
107+
</plugin>
108+
</plugins>
109+
</build>
101110
</project>

‎grpc-google-cloud-dlp-v2/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-dlp-parent</site.installationModule>
66-
<google.core.version>1.93.0</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>
7766
</properties>
7867

7968
<dependencyManagement>
@@ -95,69 +84,17 @@
9584
</dependency>
9685

9786
<dependency>
98-
<groupId>io.grpc</groupId>
99-
<artifactId>grpc-bom</artifactId>
100-
<version>${grpc.version}</version>
101-
<type>pom</type>
102-
<scope>import</scope>
103-
</dependency>
104-
<dependency>
105-
<groupId>com.google.api</groupId>
106-
<artifactId>gax-bom</artifactId>
107-
<version>${gax.version}</version>
108-
<type>pom</type>
109-
<scope>import</scope>
110-
</dependency>
111-
<dependency>
112-
<groupId>com.google.guava</groupId>
113-
<artifactId>guava-bom</artifactId>
114-
<version>${guava.version}</version>
87+
<groupId>com.google.cloud</groupId>
88+
<artifactId>google-cloud-shared-dependencies</artifactId>
89+
<version>0.8.1</version>
11590
<type>pom</type>
11691
<scope>import</scope>
11792
</dependency>
11893

119-
<dependency>
120-
<groupId>com.google.protobuf</groupId>
121-
<artifactId>protobuf-java</artifactId>
122-
<version>${protobuf.version}</version>
123-
</dependency>
124-
<dependency>
125-
<groupId>com.google.api</groupId>
126-
<artifactId>api-common</artifactId>
127-
<version>${google.api-common.version}</version>
128-
</dependency>
129-
<dependency>
130-
<groupId>com.google.api.grpc</groupId>
131-
<artifactId>proto-google-common-protos</artifactId>
132-
<version>${google.common-protos.version}</version>
133-
</dependency>
134-
<dependency>
135-
<groupId>org.threeten</groupId>
136-
<artifactId>threetenbp</artifactId>
137-
<version>${threeten.version}</version>
138-
</dependency>
139-
<dependency>
140-
<groupId>javax.annotation</groupId>
141-
<artifactId>javax.annotation-api</artifactId>
142-
<version>${javax.annotations.version}</version>
143-
</dependency>
144-
<dependency>
145-
<groupId>org.codehaus.mojo</groupId>
146-
<artifactId>animal-sniffer-annotations</artifactId>
147-
<version>${animal-sniffer.version}</version>
148-
</dependency>
149-
15094
<dependency>
15195
<groupId>junit</groupId>
15296
<artifactId>junit</artifactId>
153-
<version>${junit.version}</version>
154-
<scope>test</scope>
155-
</dependency>
156-
<dependency>
157-
<groupId>com.google.api</groupId>
158-
<artifactId>gax-grpc</artifactId>
159-
<version>${gax.version}</version>
160-
<classifier>testlib</classifier>
97+
<version>4.13</version>
16198
<scope>test</scope>
16299
</dependency>
163100
</dependencies>
@@ -247,7 +184,7 @@
247184
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
248185
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
249186
<link>https://googleapis.dev/java/gax/latest/</link>
250-
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
187+
<link>https://googleapis.github.io/api-common-java/</link>
251188
</links>
252189
</configuration>
253190
</plugin>

‎proto-google-cloud-dlp-v2/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)