Skip to content

Commit 78b2ebf

Browse files
yangnuoyuyangnuoyu
authored
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#261)
1 parent c148cff commit 78b2ebf

File tree

8 files changed

+6
-103
lines changed
  • google-cloud-firestore
  • grpc-google-cloud-firestore-admin-v1
  • grpc-google-cloud-firestore-v1beta1
  • grpc-google-cloud-firestore-v1
  • pom.xml
  • proto-google-cloud-firestore-admin-v1
  • proto-google-cloud-firestore-v1beta1
  • proto-google-cloud-firestore-v1

8 files changed

+6
-103
lines changed

‎google-cloud-firestore/pom.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
<dependency>
6060
<groupId>io.opencensus</groupId>
6161
<artifactId>opencensus-contrib-grpc-util</artifactId>
62-
<version>${opencensus.version}</version>
6362
</dependency>
6463
<dependency>
6564
<groupId>com.google.code.findbugs</groupId>
@@ -149,7 +148,7 @@
149148
<dependency>
150149
<groupId>org.mockito</groupId>
151150
<artifactId>mockito-all</artifactId>
152-
<version>${mockito.version}</version>
151+
<version>1.10.19</version>
153152
<scope>test</scope>
154153
</dependency>
155154
<!-- Need testing utility classes for generated gRPC clients tests -->
@@ -234,7 +233,6 @@
234233
<dependency>
235234
<groupId>javax.annotation</groupId>
236235
<artifactId>javax.annotation-api</artifactId>
237-
<version>${javax.annotations.version}</version>
238236
</dependency>
239237
</dependencies>
240238
</profile>

‎grpc-google-cloud-firestore-admin-v1/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@
8585
<dependency>
8686
<groupId>javax.annotation</groupId>
8787
<artifactId>javax.annotation-api</artifactId>
88-
<version>${javax.annotations.version}</version>
8988
</dependency>
9089
</dependencies>
9190
</profile>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
<dependency>
8181
<groupId>javax.annotation</groupId>
8282
<artifactId>javax.annotation-api</artifactId>
83-
<version>${javax.annotations.version}</version>
8483
</dependency>
8584
</dependencies>
8685
</profile>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
<dependency>
8181
<groupId>javax.annotation</groupId>
8282
<artifactId>javax.annotation-api</artifactId>
83-
<version>${javax.annotations.version}</version>
8483
</dependency>
8584
</dependencies>
8685
</profile>

‎pom.xml‎

Lines changed: 5 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -152,19 +152,6 @@
152152
<github.global.server>github</github.global.server>
153153
<site.installationModule>google-cloud-firestore-parent</site.installationModule>
154154
<project.javadoc.protobufBaseURL>https://googleapis.dev/java/google-api-grpc/latest</project.javadoc.protobufBaseURL>
155-
<google.core.version>1.93.6</google.core.version>
156-
<google.api-common.version>1.9.2</google.api-common.version>
157-
<google.common-protos.version>1.18.0</google.common-protos.version>
158-
<gax.version>1.57.0</gax.version>
159-
<grpc.version>1.30.0</grpc.version>
160-
<protobuf.version>3.12.2</protobuf.version>
161-
<junit.version>4.13</junit.version>
162-
<guava.version>29.0-android</guava.version>
163-
<threeten.version>1.4.4</threeten.version>
164-
<opencensus.version>0.24.0</opencensus.version>
165-
<mockito.version>1.10.19</mockito.version>
166-
<javax.annotations.version>1.3.2</javax.annotations.version>
167-
<truth.version>1.0.1</truth.version>
168155
</properties>
169156

170157
<dependencyManagement>
@@ -201,105 +188,29 @@
201188
</dependency>
202189

203190
<dependency>
204-
<groupId>io.grpc</groupId>
205-
<artifactId>grpc-bom</artifactId>
206-
<version>${grpc.version}</version>
207-
<type>pom</type>
208-
<scope>import</scope>
209-
</dependency>
210-
<dependency>
211-
<groupId>com.google.api</groupId>
212-
<artifactId>gax-bom</artifactId>
213-
<version>${gax.version}</version>
214-
<type>pom</type>
215-
<scope>import</scope>
216-
</dependency>
217-
<dependency>
218-
<groupId>com.google.guava</groupId>
219-
<artifactId>guava-bom</artifactId>
220-
<version>${guava.version}</version>
191+
<groupId>com.google.cloud</groupId>
192+
<artifactId>google-cloud-shared-dependencies</artifactId>
193+
<version>0.8.1</version>
221194
<type>pom</type>
222195
<scope>import</scope>
223196
</dependency>
224197

225-
<dependency>
226-
<groupId>com.google.cloud</groupId>
227-
<artifactId>google-cloud-core-grpc</artifactId>
228-
<version>${google.core.version}</version>
229-
</dependency>
230-
<dependency>
231-
<groupId>com.google.protobuf</groupId>
232-
<artifactId>protobuf-java</artifactId>
233-
<version>${protobuf.version}</version>
234-
</dependency>
235-
<dependency>
236-
<groupId>com.google.api</groupId>
237-
<artifactId>api-common</artifactId>
238-
<version>${google.api-common.version}</version>
239-
</dependency>
240-
<dependency>
241-
<groupId>com.google.api.grpc</groupId>
242-
<artifactId>proto-google-common-protos</artifactId>
243-
<version>${google.common-protos.version}</version>
244-
</dependency>
245-
<dependency>
246-
<groupId>org.threeten</groupId>
247-
<artifactId>threetenbp</artifactId>
248-
<version>${threeten.version}</version>
249-
</dependency>
250-
<dependency>
251-
<groupId>com.google.code.findbugs</groupId>
252-
<artifactId>jsr305</artifactId>
253-
<version>3.0.2</version>
254-
</dependency>
255-
<dependency>
256-
<groupId>io.opencensus</groupId>
257-
<artifactId>opencensus-api</artifactId>
258-
<version>${opencensus.version}</version>
259-
</dependency>
260-
<dependency>
261-
<groupId>com.google.auth</groupId>
262-
<artifactId>google-auth-library-credentials</artifactId>
263-
<version>0.20.0</version>
264-
</dependency>
265-
<dependency>
266-
<groupId>com.google.cloud</groupId>
267-
<artifactId>google-cloud-core</artifactId>
268-
<version>${google.core.version}</version>
269-
</dependency>
270-
<dependency>
271-
<groupId>com.google.code.gson</groupId>
272-
<artifactId>gson</artifactId>
273-
<version>2.8.6</version>
274-
</dependency>
275198
<dependency>
276199
<groupId>com.fasterxml.jackson.core</groupId>
277200
<artifactId>jackson-core</artifactId>
278201
<version>2.11.0</version>
279202
</dependency>
280-
<dependency>
281-
<groupId>com.google.protobuf</groupId>
282-
<artifactId>protobuf-java-util</artifactId>
283-
<version>${protobuf.version}</version>
284-
</dependency>
285203

286204
<dependency>
287205
<groupId>junit</groupId>
288206
<artifactId>junit</artifactId>
289-
<version>${junit.version}</version>
207+
<version>4.13</version>
290208
<scope>test</scope>
291209
</dependency>
292210
<dependency>
293211
<groupId>com.google.truth</groupId>
294212
<artifactId>truth</artifactId>
295-
<version>${truth.version}</version>
296-
<scope>test</scope>
297-
</dependency>
298-
<dependency>
299-
<groupId>com.google.api</groupId>
300-
<artifactId>gax-grpc</artifactId>
301-
<version>${gax.version}</version>
302-
<classifier>testlib</classifier>
213+
<version>1.0.1</version>
303214
<scope>test</scope>
304215
</dependency>
305216
</dependencies>

‎proto-google-cloud-firestore-admin-v1/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
<dependency>
5252
<groupId>javax.annotation</groupId>
5353
<artifactId>javax.annotation-api</artifactId>
54-
<version>${javax.annotations.version}</version>
5554
</dependency>
5655
</dependencies>
5756
</profile>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
<dependency>
5252
<groupId>javax.annotation</groupId>
5353
<artifactId>javax.annotation-api</artifactId>
54-
<version>${javax.annotations.version}</version>
5554
</dependency>
5655
</dependencies>
5756
</profile>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
<dependency>
5252
<groupId>javax.annotation</groupId>
5353
<artifactId>javax.annotation-api</artifactId>
54-
<version>${javax.annotations.version}</version>
5554
</dependency>
5655
</dependencies>
5756
</profile>

0 commit comments

Comments
 (0)