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

Commit ab9f795

Browse files
yangnuoyuyangnuoyu
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#184)
1 parent a8b1f98 commit ab9f795

7 files changed

Lines changed: 48 additions & 83 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-containeranalysis/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,5 +128,11 @@
128128
</plugin>
129129
</plugins>
130130
</pluginManagement>
131+
<plugins>
132+
<plugin>
133+
<groupId>org.codehaus.mojo</groupId>
134+
<artifactId>flatten-maven-plugin</artifactId>
135+
</plugin>
136+
</plugins>
131137
</build>
132138
</project>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,14 @@
4343
</dependency>
4444
</dependencies>
4545

46+
<build>
47+
<plugins>
48+
<plugin>
49+
<groupId>org.codehaus.mojo</groupId>
50+
<artifactId>flatten-maven-plugin</artifactId>
51+
</plugin>
52+
</plugins>
53+
</build>
4654
<!-- <profiles>-->
4755
<!-- <profile>-->
4856
<!-- <id>java9</id>-->

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,14 @@
4343
</dependency>
4444
</dependencies>
4545

46+
<build>
47+
<plugins>
48+
<plugin>
49+
<groupId>org.codehaus.mojo</groupId>
50+
<artifactId>flatten-maven-plugin</artifactId>
51+
</plugin>
52+
</plugins>
53+
</build>
4654
<!-- <profiles>-->
4755
<!-- <profile>-->
4856
<!-- <id>java9</id>-->

‎pom.xml‎

Lines changed: 5 additions & 82 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-containeranalysis-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>
@@ -105,91 +94,25 @@
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-
<dependency>
160-
<groupId>com.google.api.grpc</groupId>
161-
<artifactId>proto-google-iam-v1</artifactId>
162-
<version>0.13.0</version>
163-
</dependency>
164-
<dependency>
165-
<groupId>com.google.code.gson</groupId>
166-
<artifactId>gson</artifactId>
167-
<version>2.8.6</version>
168-
</dependency>
169104
<!-- TODO: This should maybe eventually be moved into this repo -->
170105
<dependency>
171106
<groupId>io.grafeas</groupId>
172107
<artifactId>grafeas</artifactId>
173108
<version>0.24.1</version>
174109
</dependency>
175110
<!-- TODO: Until gax-grpc && grafeas align -->
176-
<dependency>
177-
<groupId>com.google.protobuf</groupId>
178-
<artifactId>protobuf-java-util</artifactId>
179-
<version>3.12.2</version>
180-
</dependency>
181111

182112
<dependency>
183113
<groupId>junit</groupId>
184114
<artifactId>junit</artifactId>
185-
<version>${junit.version}</version>
186-
<scope>test</scope>
187-
</dependency>
188-
<dependency>
189-
<groupId>com.google.api</groupId>
190-
<artifactId>gax-grpc</artifactId>
191-
<version>${gax.version}</version>
192-
<classifier>testlib</classifier>
115+
<version>4.13</version>
193116
<scope>test</scope>
194117
</dependency>
195118
</dependencies>
@@ -281,7 +204,7 @@
281204
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
282205
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
283206
<link>https://googleapis.dev/java/gax/latest/</link>
284-
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
207+
<link>https://googleapis.github.io/api-common-java/</link>
285208
</links>
286209
</configuration>
287210
</plugin>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,13 @@
3434
<artifactId>proto-google-iam-v1</artifactId>
3535
</dependency>
3636
</dependencies>
37+
38+
<build>
39+
<plugins>
40+
<plugin>
41+
<groupId>org.codehaus.mojo</groupId>
42+
<artifactId>flatten-maven-plugin</artifactId>
43+
</plugin>
44+
</plugins>
45+
</build>
3746
</project>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,13 @@
3434
<artifactId>proto-google-iam-v1</artifactId>
3535
</dependency>
3636
</dependencies>
37+
38+
<build>
39+
<plugins>
40+
<plugin>
41+
<groupId>org.codehaus.mojo</groupId>
42+
<artifactId>flatten-maven-plugin</artifactId>
43+
</plugin>
44+
</plugins>
45+
</build>
3746
</project>

0 commit comments

Comments
 (0)