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

Commit e3871d0

Browse files
yangnuoyuyangnuoyu
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#166)
1 parent 1ba48c6 commit e3871d0

File tree

9 files changed

+71
-78
lines changed
  • .gitignore
  • google-cloud-websecurityscanner
  • grpc-google-cloud-websecurityscanner-v1alpha
  • grpc-google-cloud-websecurityscanner-v1beta
  • grpc-google-cloud-websecurityscanner-v1
  • pom.xml
  • proto-google-cloud-websecurityscanner-v1alpha
  • proto-google-cloud-websecurityscanner-v1beta
  • proto-google-cloud-websecurityscanner-v1

9 files changed

+71
-78
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-websecurityscanner/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,4 +126,13 @@
126126
</dependencies>
127127
</profile>
128128
</profiles>
129+
130+
<build>
131+
<plugins>
132+
<plugin>
133+
<groupId>org.codehaus.mojo</groupId>
134+
<artifactId>flatten-maven-plugin</artifactId>
135+
</plugin>
136+
</plugins>
137+
</build>
129138
</project>

‎grpc-google-cloud-websecurityscanner-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-websecurityscanner-v1alpha/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-websecurityscanner-v1beta/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: 6 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,6 @@
6363
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6464
<github.global.server>github</github.global.server>
6565
<site.installationModule>google-cloud-websecurityscanner-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-
<google.auth.version>0.20.0</google.auth.version>
70-
<gax.version>1.57.0</gax.version>
71-
<grpc.version>1.30.0</grpc.version>
72-
<protobuf.version>3.12.2</protobuf.version>
73-
<junit.version>4.13</junit.version>
74-
<guava.version>29.0-android</guava.version>
75-
<threeten.version>1.4.4</threeten.version>
76-
<javax.annotations.version>1.3.2</javax.annotations.version>
77-
<animal-sniffer.version>1.18</animal-sniffer.version>
78-
<joda.version>2.10.6</joda.version>
7966
</properties>
8067

8168
<dependencyManagement>
@@ -117,82 +104,23 @@
117104
</dependency>
118105

119106
<dependency>
120-
<groupId>com.google.auth</groupId>
121-
<artifactId>google-auth-library-bom</artifactId>
122-
<version>${google.auth.version}</version>
123-
<type>pom</type>
124-
<scope>import</scope>
125-
</dependency>
126-
<dependency>
127-
<groupId>io.grpc</groupId>
128-
<artifactId>grpc-bom</artifactId>
129-
<version>${grpc.version}</version>
130-
<type>pom</type>
131-
<scope>import</scope>
132-
</dependency>
133-
<dependency>
134-
<groupId>com.google.api</groupId>
135-
<artifactId>gax-bom</artifactId>
136-
<version>${gax.version}</version>
137-
<type>pom</type>
138-
<scope>import</scope>
139-
</dependency>
140-
<dependency>
141-
<groupId>com.google.guava</groupId>
142-
<artifactId>guava-bom</artifactId>
143-
<version>${guava.version}</version>
107+
<groupId>com.google.cloud</groupId>
108+
<artifactId>google-cloud-shared-dependencies</artifactId>
109+
<version>0.8.1</version>
144110
<type>pom</type>
145111
<scope>import</scope>
146112
</dependency>
147113

148-
<dependency>
149-
<groupId>com.google.protobuf</groupId>
150-
<artifactId>protobuf-java</artifactId>
151-
<version>${protobuf.version}</version>
152-
</dependency>
153-
<dependency>
154-
<groupId>com.google.api</groupId>
155-
<artifactId>api-common</artifactId>
156-
<version>${google.api-common.version}</version>
157-
</dependency>
158-
<dependency>
159-
<groupId>com.google.api.grpc</groupId>
160-
<artifactId>proto-google-common-protos</artifactId>
161-
<version>${google.common-protos.version}</version>
162-
</dependency>
163-
<dependency>
164-
<groupId>org.threeten</groupId>
165-
<artifactId>threetenbp</artifactId>
166-
<version>${threeten.version}</version>
167-
</dependency>
168-
<dependency>
169-
<groupId>javax.annotation</groupId>
170-
<artifactId>javax.annotation-api</artifactId>
171-
<version>${javax.annotations.version}</version>
172-
</dependency>
173-
<dependency>
174-
<groupId>org.codehaus.mojo</groupId>
175-
<artifactId>animal-sniffer-annotations</artifactId>
176-
<version>${animal-sniffer.version}</version>
177-
</dependency>
178-
179114
<dependency>
180115
<groupId>junit</groupId>
181116
<artifactId>junit</artifactId>
182-
<version>${junit.version}</version>
117+
<version>4.13</version>
183118
<scope>test</scope>
184119
</dependency>
185120
<dependency>
186121
<groupId>joda-time</groupId>
187122
<artifactId>joda-time</artifactId>
188-
<version>${joda.version}</version>
189-
<scope>test</scope>
190-
</dependency>
191-
<dependency>
192-
<groupId>com.google.api</groupId>
193-
<artifactId>gax-grpc</artifactId>
194-
<version>${gax.version}</version>
195-
<classifier>testlib</classifier>
123+
<version>2.10.6</version>
196124
<scope>test</scope>
197125
</dependency>
198126
</dependencies>
@@ -286,7 +214,7 @@
286214
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
287215
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
288216
<link>https://googleapis.dev/java/gax/latest/</link>
289-
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
217+
<link>https://googleapis.github.io/api-common-java/</link>
290218
</links>
291219
</configuration>
292220
</plugin>

‎proto-google-cloud-websecurityscanner-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>

‎proto-google-cloud-websecurityscanner-v1alpha/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>

‎proto-google-cloud-websecurityscanner-v1beta/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)