From da2c01228df6ec735319e091c1df715175463eaa Mon Sep 17 00:00:00 2001
From: yangnuoyu <46553752+yangnuoyu@users.noreply.github.com>
Date: Wed, 17 Jun 2020 19:13:12 -0700
Subject: [PATCH] feat(deps): adopt flatten plugin and
google-cloud-shared-dependencies (#176)
---
.gitignore | 2 +
google-cloud-iamcredentials/pom.xml | 9 +++
grpc-google-cloud-iamcredentials-v1/pom.xml | 9 +++
pom.xml | 73 ++------------------
proto-google-cloud-iamcredentials-v1/pom.xml | 9 +++
5 files changed, 34 insertions(+), 68 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/google-cloud-iamcredentials/pom.xml b/google-cloud-iamcredentials/pom.xml
index 9772c5c5..e76c444f 100644
--- a/google-cloud-iamcredentials/pom.xml
+++ b/google-cloud-iamcredentials/pom.xml
@@ -98,4 +98,13 @@
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file
diff --git a/grpc-google-cloud-iamcredentials-v1/pom.xml b/grpc-google-cloud-iamcredentials-v1/pom.xml
index 3715b1ef..cd42f1f3 100644
--- a/grpc-google-cloud-iamcredentials-v1/pom.xml
+++ b/grpc-google-cloud-iamcredentials-v1/pom.xml
@@ -53,4 +53,13 @@
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5e25ddbe..a204bc41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,17 +63,6 @@
UTF-8
github
google-cloud-iamcredentials-parent
- 1.93.0
- 1.9.2
- 1.18.0
- 1.56.0
- 1.30.0
- 3.12.2
- 4.13
- 29.0-android
- 1.4.4
- 1.3.2
- 1.18
@@ -95,69 +84,17 @@
- 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.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}
-
-
- javax.annotation
- javax.annotation-api
- ${javax.annotations.version}
-
-
- org.codehaus.mojo
- animal-sniffer-annotations
- ${animal-sniffer.version}
-
-
junit
junit
- ${junit.version}
- test
-
-
- com.google.api
- gax-grpc
- ${gax.version}
- testlib
+ 4.13
test
@@ -247,7 +184,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/
diff --git a/proto-google-cloud-iamcredentials-v1/pom.xml b/proto-google-cloud-iamcredentials-v1/pom.xml
index 2f0cf8f1..e0885038 100644
--- a/proto-google-cloud-iamcredentials-v1/pom.xml
+++ b/proto-google-cloud-iamcredentials-v1/pom.xml
@@ -30,4 +30,13 @@
guava
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file