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

Commit f11d67b

Browse files
yangnuoyuyangnuoyu
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#181)
1 parent 3b9268e commit f11d67b

File tree

9 files changed

+71
-76
lines changed
  • .gitignore
  • google-cloud-securitycenter
  • grpc-google-cloud-securitycenter-v1beta1
  • grpc-google-cloud-securitycenter-v1p1beta1
  • grpc-google-cloud-securitycenter-v1
  • pom.xml
  • proto-google-cloud-securitycenter-v1beta1
  • proto-google-cloud-securitycenter-v1p1beta1
  • proto-google-cloud-securitycenter-v1

9 files changed

+71
-76
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,6 @@ api_key
4040
# Python utilities
4141
*.pyc
4242
artman-genfiles
43-
venv
43+
venv
44+
45+
.flattened-pom.xml

‎google-cloud-securitycenter/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,13 @@
120120
</dependencies>
121121
</profile>
122122
</profiles>
123+
124+
<build>
125+
<plugins>
126+
<plugin>
127+
<groupId>org.codehaus.mojo</groupId>
128+
<artifactId>flatten-maven-plugin</artifactId>
129+
</plugin>
130+
</plugins>
131+
</build>
123132
</project>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,13 @@
6161
</dependencies>
6262
</profile>
6363
</profiles>
64+
65+
<build>
66+
<plugins>
67+
<plugin>
68+
<groupId>org.codehaus.mojo</groupId>
69+
<artifactId>flatten-maven-plugin</artifactId>
70+
</plugin>
71+
</plugins>
72+
</build>
6473
</project>

‎grpc-google-cloud-securitycenter-v1beta1/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,13 @@
6161
</dependencies>
6262
</profile>
6363
</profiles>
64+
65+
<build>
66+
<plugins>
67+
<plugin>
68+
<groupId>org.codehaus.mojo</groupId>
69+
<artifactId>flatten-maven-plugin</artifactId>
70+
</plugin>
71+
</plugins>
72+
</build>
6473
</project>

‎grpc-google-cloud-securitycenter-v1p1beta1/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,13 @@
6161
</dependencies>
6262
</profile>
6363
</profiles>
64+
65+
<build>
66+
<plugins>
67+
<plugin>
68+
<groupId>org.codehaus.mojo</groupId>
69+
<artifactId>flatten-maven-plugin</artifactId>
70+
</plugin>
71+
</plugins>
72+
</build>
6473
</project>

‎pom.xml‎

Lines changed: 5 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,6 @@
6363
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6464
<github.global.server>github</github.global.server>
6565
<site.installationModule>google-cloud-securitycenter-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>
77-
<google.proto-iam.version>0.13.0</google.proto-iam.version>
7866
</properties>
7967

8068
<dependencyManagement>
@@ -116,75 +104,17 @@
116104
</dependency>
117105

118106
<dependency>
119-
<groupId>io.grpc</groupId>
120-
<artifactId>grpc-bom</artifactId>
121-
<version>${grpc.version}</version>
122-
<type>pom</type>
123-
<scope>import</scope>
124-
</dependency>
125-
<dependency>
126-
<groupId>com.google.api</groupId>
127-
<artifactId>gax-bom</artifactId>
128-
<version>${gax.version}</version>
129-
<type>pom</type>
130-
<scope>import</scope>
131-
</dependency>
132-
<dependency>
133-
<groupId>com.google.guava</groupId>
134-
<artifactId>guava-bom</artifactId>
135-
<version>${guava.version}</version>
107+
<groupId>com.google.cloud</groupId>
108+
<artifactId>google-cloud-shared-dependencies</artifactId>
109+
<version>0.8.1</version>
136110
<type>pom</type>
137111
<scope>import</scope>
138112
</dependency>
139113

140-
<dependency>
141-
<groupId>com.google.protobuf</groupId>
142-
<artifactId>protobuf-java</artifactId>
143-
<version>${protobuf.version}</version>
144-
</dependency>
145-
<dependency>
146-
<groupId>com.google.api</groupId>
147-
<artifactId>api-common</artifactId>
148-
<version>${google.api-common.version}</version>
149-
</dependency>
150-
<dependency>
151-
<groupId>com.google.api.grpc</groupId>
152-
<artifactId>proto-google-common-protos</artifactId>
153-
<version>${google.common-protos.version}</version>
154-
</dependency>
155-
<dependency>
156-
<groupId>org.threeten</groupId>
157-
<artifactId>threetenbp</artifactId>
158-
<version>${threeten.version}</version>
159-
</dependency>
160-
<dependency>
161-
<groupId>javax.annotation</groupId>
162-
<artifactId>javax.annotation-api</artifactId>
163-
<version>${javax.annotations.version}</version>
164-
</dependency>
165-
<dependency>
166-
<groupId>org.codehaus.mojo</groupId>
167-
<artifactId>animal-sniffer-annotations</artifactId>
168-
<version>${animal-sniffer.version}</version>
169-
</dependency>
170-
<dependency>
171-
<groupId>com.google.api.grpc</groupId>
172-
<artifactId>proto-google-iam-v1</artifactId>
173-
<version>${google.proto-iam.version}</version>
174-
</dependency>
175-
176-
177114
<dependency>
178115
<groupId>junit</groupId>
179116
<artifactId>junit</artifactId>
180-
<version>${junit.version}</version>
181-
<scope>test</scope>
182-
</dependency>
183-
<dependency>
184-
<groupId>com.google.api</groupId>
185-
<artifactId>gax-grpc</artifactId>
186-
<version>${gax.version}</version>
187-
<classifier>testlib</classifier>
117+
<version>4.13</version>
188118
<scope>test</scope>
189119
</dependency>
190120
</dependencies>
@@ -278,7 +208,7 @@
278208
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
279209
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
280210
<link>https://googleapis.dev/java/gax/latest/</link>
281-
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
211+
<link>https://googleapis.github.io/api-common-java/</link>
282212
</links>
283213
</configuration>
284214
</plugin>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,13 @@
3535
</dependency>
3636

3737
</dependencies>
38+
39+
<build>
40+
<plugins>
41+
<plugin>
42+
<groupId>org.codehaus.mojo</groupId>
43+
<artifactId>flatten-maven-plugin</artifactId>
44+
</plugin>
45+
</plugins>
46+
</build>
3847
</project>

‎proto-google-cloud-securitycenter-v1beta1/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,13 @@
3535
</dependency>
3636

3737
</dependencies>
38+
39+
<build>
40+
<plugins>
41+
<plugin>
42+
<groupId>org.codehaus.mojo</groupId>
43+
<artifactId>flatten-maven-plugin</artifactId>
44+
</plugin>
45+
</plugins>
46+
</build>
3847
</project>

‎proto-google-cloud-securitycenter-v1p1beta1/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,13 @@
3535
</dependency>
3636

3737
</dependencies>
38+
39+
<build>
40+
<plugins>
41+
<plugin>
42+
<groupId>org.codehaus.mojo</groupId>
43+
<artifactId>flatten-maven-plugin</artifactId>
44+
</plugin>
45+
</plugins>
46+
</build>
3847
</project>

0 commit comments

Comments
 (0)