From 82c4bf50f419b7f57f9a0d15a554b7e8509b99db Mon Sep 17 00:00:00 2001 From: yangnuoyu <46553752+yangnuoyu@users.noreply.github.com> Date: Wed, 17 Jun 2020 19:11:57 -0700 Subject: [PATCH] feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#14) --- .gitignore | 2 ++ grpc-google-iam-v1/pom.xml | 1 - pom.xml | 32 +++++--------------------------- 3 files changed, 7 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index fadd6afc..069d08fc 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ target/ # python utilities *.pyc __pycache__ + +.flattened-pom.xml diff --git a/grpc-google-iam-v1/pom.xml b/grpc-google-iam-v1/pom.xml index 4948f365..e33afd03 100644 --- a/grpc-google-iam-v1/pom.xml +++ b/grpc-google-iam-v1/pom.xml @@ -58,7 +58,6 @@ javax.annotation javax.annotation-api - 1.3.2 diff --git a/pom.xml b/pom.xml index a656f38e..e771161c 100644 --- a/pom.xml +++ b/pom.xml @@ -63,39 +63,17 @@ UTF-8 github google-iam-parent - 1.18.0 - 3.12.2 - 4.13 - 1.30.0 - 29.0-android - com.google.protobuf - protobuf-bom - ${protobuf.version} + com.google.cloud + google-cloud-shared-dependencies + 0.8.1 pom import - - io.grpc - grpc-bom - ${grpc.version} - pom - import - - - com.google.api.grpc - proto-google-common-protos - ${google.common-protos.version} - - - com.google.guava - guava - ${guava.version} - com.google.api.grpc proto-google-iam-v1 @@ -105,7 +83,7 @@ junit junit - ${junit.version} + 4.13 test @@ -179,7 +157,7 @@ https://developers.google.com/protocol-buffers/docs/reference/java/ https://googleapis.dev/java/google-auth-library/latest/ https://googleapis.dev/java/gax/latest/ - https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/ + https://googleapis.github.io/api-common-java/