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

Commit 3fb794a

Browse files
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#146)
1 parent ce5ff2e commit 3fb794a

File tree

2 files changed

+16
-56
lines changed

2 files changed

+16
-56
lines changed

.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

pom.xml

Lines changed: 13 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -63,67 +63,21 @@
6363
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6464
<github.global.server>github</github.global.server>
6565
<site.installationModule>google-cloud-dns-parent</site.installationModule>
66-
<google.core.version>1.93.5</google.core.version>
67-
<google.api-common.version>1.9.2</google.api-common.version>
68-
<google.common-protos.version>1.17.0</google.common-protos.version>
69-
<google.auth.version>0.20.0</google.auth.version>
70-
<gax.version>1.56.0</gax.version>
71-
<junit.version>4.13</junit.version>
72-
<guava.version>29.0-android</guava.version>
73-
<threeten.version>1.4.4</threeten.version>
74-
<animal-sniffer.version>1.18</animal-sniffer.version>
75-
<easymock.version>3.6</easymock.version>
76-
<errorprone.version>2.3.4</errorprone.version>
7766
</properties>
7867

7968
<dependencyManagement>
8069
<dependencies>
81-
<dependency>
82-
<groupId>com.google.api</groupId>
83-
<artifactId>gax-bom</artifactId>
84-
<version>${gax.version}</version>
85-
<type>pom</type>
86-
<scope>import</scope>
87-
</dependency>
88-
<dependency>
89-
<groupId>com.google.guava</groupId>
90-
<artifactId>guava-bom</artifactId>
91-
<version>${guava.version}</version>
92-
<type>pom</type>
93-
<scope>import</scope>
94-
</dependency>
95-
<dependency>
96-
<groupId>com.google.http-client</groupId>
97-
<artifactId>google-http-client-bom</artifactId>
98-
<version>1.35.0</version>
99-
<type>pom</type>
100-
<scope>import</scope>
101-
</dependency>
102-
<dependency>
103-
<groupId>com.google.api-client</groupId>
104-
<artifactId>google-api-client-bom</artifactId>
105-
<version>1.30.9</version>
106-
<type>pom</type>
107-
<scope>import</scope>
108-
</dependency>
10970
<dependency>
11071
<groupId>com.google.cloud</groupId>
111-
<artifactId>google-cloud-core-bom</artifactId>
112-
<version>${google.core.version}</version>
113-
<type>pom</type>
114-
<scope>import</scope>
115-
</dependency>
116-
<dependency>
117-
<groupId>com.google.auth</groupId>
118-
<artifactId>google-auth-library-bom</artifactId>
119-
<version>${google.auth.version}</version>
72+
<artifactId>google-cloud-shared-dependencies</artifactId>
73+
<version>0.8.1</version>
12074
<type>pom</type>
12175
<scope>import</scope>
12276
</dependency>
12377
<dependency>
12478
<groupId>com.google.errorprone</groupId>
12579
<artifactId>error_prone_annotations</artifactId>
126-
<version>${errorprone.version}</version>
80+
<version>2.3.4</version>
12781
</dependency>
12882
</dependencies>
12983
</dependencyManagement>
@@ -169,31 +123,28 @@
169123
<dependency>
170124
<groupId>com.google.api</groupId>
171125
<artifactId>api-common</artifactId>
172-
<version>${google.api-common.version}</version>
173126
</dependency>
174127
<dependency>
175128
<groupId>org.threeten</groupId>
176129
<artifactId>threetenbp</artifactId>
177-
<version>${threeten.version}</version>
178130
</dependency>
179131

180132
<dependency>
181133
<groupId>com.google.cloud</groupId>
182134
<artifactId>google-cloud-core</artifactId>
183-
<version>${google.core.version}</version>
184135
<type>test-jar</type>
185136
<scope>test</scope>
186137
</dependency>
187138
<dependency>
188139
<groupId>junit</groupId>
189140
<artifactId>junit</artifactId>
190-
<version>${junit.version}</version>
141+
<version>4.13</version>
191142
<scope>test</scope>
192143
</dependency>
193144
<dependency>
194145
<groupId>org.easymock</groupId>
195146
<artifactId>easymock</artifactId>
196-
<version>${easymock.version}</version>
147+
<version>3.6</version>
197148
<scope>test</scope>
198149
</dependency>
199150
</dependencies>
@@ -210,6 +161,13 @@
210161
</plugin>
211162
</plugins>
212163
</pluginManagement>
164+
165+
<plugins>
166+
<plugin>
167+
<groupId>org.codehaus.mojo</groupId>
168+
<artifactId>flatten-maven-plugin</artifactId>
169+
</plugin>
170+
</plugins>
213171
</build>
214172

215173
<reporting>
@@ -275,7 +233,7 @@
275233
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
276234
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
277235
<link>https://googleapis.dev/java/gax/latest/</link>
278-
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
236+
<link>https://googleapis.github.io/api-common-java/</link>
279237
</links>
280238
</configuration>
281239
</plugin>

0 commit comments

Comments
 (0)