From 78b2ebf3c75c774f1ace386fa5f32e76b470ed9c Mon Sep 17 00:00:00 2001
From: yangnuoyu <46553752+yangnuoyu@users.noreply.github.com>
Date: Thu, 18 Jun 2020 14:55:08 -0700
Subject: [PATCH] feat(deps): adopt flatten plugin and
google-cloud-shared-dependencies (#261)
---
google-cloud-firestore/pom.xml | 4 +-
grpc-google-cloud-firestore-admin-v1/pom.xml | 1 -
grpc-google-cloud-firestore-v1/pom.xml | 1 -
grpc-google-cloud-firestore-v1beta1/pom.xml | 1 -
pom.xml | 99 +------------------
proto-google-cloud-firestore-admin-v1/pom.xml | 1 -
proto-google-cloud-firestore-v1/pom.xml | 1 -
proto-google-cloud-firestore-v1beta1/pom.xml | 1 -
8 files changed, 6 insertions(+), 103 deletions(-)
diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml
index a2a7acbc8..77a891afb 100644
--- a/google-cloud-firestore/pom.xml
+++ b/google-cloud-firestore/pom.xml
@@ -59,7 +59,6 @@
io.opencensus
opencensus-contrib-grpc-util
- ${opencensus.version}
com.google.code.findbugs
@@ -149,7 +148,7 @@
org.mockito
mockito-all
- ${mockito.version}
+ 1.10.19
test
@@ -234,7 +233,6 @@
javax.annotation
javax.annotation-api
- ${javax.annotations.version}
diff --git a/grpc-google-cloud-firestore-admin-v1/pom.xml b/grpc-google-cloud-firestore-admin-v1/pom.xml
index 68ee98ccb..ec9f0f85b 100644
--- a/grpc-google-cloud-firestore-admin-v1/pom.xml
+++ b/grpc-google-cloud-firestore-admin-v1/pom.xml
@@ -85,7 +85,6 @@
javax.annotation
javax.annotation-api
- ${javax.annotations.version}
diff --git a/grpc-google-cloud-firestore-v1/pom.xml b/grpc-google-cloud-firestore-v1/pom.xml
index aa0de0a3d..2246c7d47 100644
--- a/grpc-google-cloud-firestore-v1/pom.xml
+++ b/grpc-google-cloud-firestore-v1/pom.xml
@@ -80,7 +80,6 @@
javax.annotation
javax.annotation-api
- ${javax.annotations.version}
diff --git a/grpc-google-cloud-firestore-v1beta1/pom.xml b/grpc-google-cloud-firestore-v1beta1/pom.xml
index 3a343f55d..eaa04121b 100644
--- a/grpc-google-cloud-firestore-v1beta1/pom.xml
+++ b/grpc-google-cloud-firestore-v1beta1/pom.xml
@@ -80,7 +80,6 @@
javax.annotation
javax.annotation-api
- ${javax.annotations.version}
diff --git a/pom.xml b/pom.xml
index b61cb849c..2089c2fdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,19 +152,6 @@
github
google-cloud-firestore-parent
https://googleapis.dev/java/google-api-grpc/latest
- 1.93.6
- 1.9.2
- 1.18.0
- 1.57.0
- 1.30.0
- 3.12.2
- 4.13
- 29.0-android
- 1.4.4
- 0.24.0
- 1.10.19
- 1.3.2
- 1.0.1
@@ -201,105 +188,29 @@
- io.grpc
- grpc-bom
- ${grpc.version}
- pom
- import
-
-
- com.google.api
- gax-bom
- ${gax.version}
- pom
- import
-
-
- com.google.guava
- guava-bom
- ${guava.version}
+ com.google.cloud
+ google-cloud-shared-dependencies
+ 0.8.1
pom
import
-
- com.google.cloud
- google-cloud-core-grpc
- ${google.core.version}
-
-
- com.google.protobuf
- protobuf-java
- ${protobuf.version}
-
-
- com.google.api
- api-common
- ${google.api-common.version}
-
-
- com.google.api.grpc
- proto-google-common-protos
- ${google.common-protos.version}
-
-
- org.threeten
- threetenbp
- ${threeten.version}
-
-
- com.google.code.findbugs
- jsr305
- 3.0.2
-
-
- io.opencensus
- opencensus-api
- ${opencensus.version}
-
-
- com.google.auth
- google-auth-library-credentials
- 0.20.0
-
-
- com.google.cloud
- google-cloud-core
- ${google.core.version}
-
-
- com.google.code.gson
- gson
- 2.8.6
-
com.fasterxml.jackson.core
jackson-core
2.11.0
-
- com.google.protobuf
- protobuf-java-util
- ${protobuf.version}
-
junit
junit
- ${junit.version}
+ 4.13
test
com.google.truth
truth
- ${truth.version}
- test
-
-
- com.google.api
- gax-grpc
- ${gax.version}
- testlib
+ 1.0.1
test
diff --git a/proto-google-cloud-firestore-admin-v1/pom.xml b/proto-google-cloud-firestore-admin-v1/pom.xml
index fcc9b3255..26be7561a 100644
--- a/proto-google-cloud-firestore-admin-v1/pom.xml
+++ b/proto-google-cloud-firestore-admin-v1/pom.xml
@@ -51,7 +51,6 @@
javax.annotation
javax.annotation-api
- ${javax.annotations.version}
diff --git a/proto-google-cloud-firestore-v1/pom.xml b/proto-google-cloud-firestore-v1/pom.xml
index c1cc81f79..ade932d8b 100644
--- a/proto-google-cloud-firestore-v1/pom.xml
+++ b/proto-google-cloud-firestore-v1/pom.xml
@@ -51,7 +51,6 @@
javax.annotation
javax.annotation-api
- ${javax.annotations.version}
diff --git a/proto-google-cloud-firestore-v1beta1/pom.xml b/proto-google-cloud-firestore-v1beta1/pom.xml
index 9579bcc47..502f6acd3 100644
--- a/proto-google-cloud-firestore-v1beta1/pom.xml
+++ b/proto-google-cloud-firestore-v1beta1/pom.xml
@@ -51,7 +51,6 @@
javax.annotation
javax.annotation-api
- ${javax.annotations.version}