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

Commit d001d6f

Browse files
yangnuoyuyangnuoyu
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#206)
1 parent e909f20 commit d001d6f

File tree

5 files changed

+35
-80
lines changed

5 files changed

+35
-80
lines changed

‎.gitignore

+3-1
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-container/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,13 @@
102102
</dependencies>
103103
</profile>
104104
</profiles>
105+
106+
<build>
107+
<plugins>
108+
<plugin>
109+
<groupId>org.codehaus.mojo</groupId>
110+
<artifactId>flatten-maven-plugin</artifactId>
111+
</plugin>
112+
</plugins>
113+
</build>
105114
</project>

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

+9
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

+5-79
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-container-parent</site.installationModule>
66-
<google.core.version>1.93.6</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.2</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,80 +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>
115-
<type>pom</type>
116-
<scope>import</scope>
117-
</dependency>
118-
<dependency>
119-
<groupId>com.google.protobuf</groupId>
120-
<artifactId>protobuf-bom</artifactId>
121-
<version>${protobuf.version}</version>
87+
<groupId>com.google.cloud</groupId>
88+
<artifactId>google-cloud-shared-dependencies</artifactId>
89+
<version>0.8.1</version>
12290
<type>pom</type>
12391
<scope>import</scope>
12492
</dependency>
125-
<dependency>
126-
<groupId>com.google.api</groupId>
127-
<artifactId>api-common</artifactId>
128-
<version>${google.api-common.version}</version>
129-
</dependency>
130-
<dependency>
131-
<groupId>com.google.api.grpc</groupId>
132-
<artifactId>proto-google-common-protos</artifactId>
133-
<version>${google.common-protos.version}</version>
134-
</dependency>
135-
<dependency>
136-
<groupId>com.google.cloud</groupId>
137-
<artifactId>google-cloud-core</artifactId>
138-
<version>${google.core.version}</version>
139-
</dependency>
140-
<dependency>
141-
<groupId>org.threeten</groupId>
142-
<artifactId>threetenbp</artifactId>
143-
<version>${threeten.version}</version>
144-
</dependency>
145-
<dependency>
146-
<groupId>javax.annotation</groupId>
147-
<artifactId>javax.annotation-api</artifactId>
148-
<version>${javax.annotations.version}</version>
149-
</dependency>
150-
<dependency>
151-
<groupId>org.codehaus.mojo</groupId>
152-
<artifactId>animal-sniffer-annotations</artifactId>
153-
<version>${animal-sniffer.version}</version>
154-
</dependency>
155-
<dependency>
156-
<groupId>com.google.code.gson</groupId>
157-
<artifactId>gson</artifactId>
158-
<version>2.8.6</version>
159-
</dependency>
16093

16194
<dependency>
16295
<groupId>junit</groupId>
16396
<artifactId>junit</artifactId>
164-
<version>${junit.version}</version>
165-
<scope>test</scope>
166-
</dependency>
167-
<dependency>
168-
<groupId>com.google.api</groupId>
169-
<artifactId>gax-grpc</artifactId>
170-
<version>${gax.version}</version>
171-
<classifier>testlib</classifier>
97+
<version>4.13</version>
17298
<scope>test</scope>
17399
</dependency>
174100
</dependencies>
@@ -258,7 +184,7 @@
258184
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
259185
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
260186
<link>https://googleapis.dev/java/gax/latest/</link>
261-
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
187+
<link>https://googleapis.github.io/api-common-java/</link>
262188
</links>
263189
</configuration>
264190
</plugin>

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

+9
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)