From 504f871bbf7fc847eeab37eaa9c1836e2a3af994 Mon Sep 17 00:00:00 2001
From: yangnuoyu <46553752+yangnuoyu@users.noreply.github.com>
Date: Tue, 16 Jun 2020 16:08:21 -0700
Subject: [PATCH] feat(deps): adopt flatten plugin and
google-cloud-shared-dependencies (#220)
---
.gitignore | 2 +
google-cloud-asset/pom.xml | 9 +++
grpc-google-cloud-asset-v1/pom.xml | 9 +++
grpc-google-cloud-asset-v1beta1/pom.xml | 9 +++
grpc-google-cloud-asset-v1p1beta1/pom.xml | 9 +++
grpc-google-cloud-asset-v1p2beta1/pom.xml | 9 +++
grpc-google-cloud-asset-v1p4beta1/pom.xml | 9 +++
pom.xml | 84 ++--------------------
proto-google-cloud-asset-v1/pom.xml | 9 +++
proto-google-cloud-asset-v1beta1/pom.xml | 9 +++
proto-google-cloud-asset-v1p1beta1/pom.xml | 9 +++
proto-google-cloud-asset-v1p2beta1/pom.xml | 9 +++
proto-google-cloud-asset-v1p4beta1/pom.xml | 9 +++
13 files changed, 106 insertions(+), 79 deletions(-)
diff --git a/.gitignore b/.gitignore
index fadd6afc2..069d08fc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ target/
# python utilities
*.pyc
__pycache__
+
+.flattened-pom.xml
diff --git a/google-cloud-asset/pom.xml b/google-cloud-asset/pom.xml
index 72e12652b..4ac6a3b0c 100644
--- a/google-cloud-asset/pom.xml
+++ b/google-cloud-asset/pom.xml
@@ -153,4 +153,13 @@
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file
diff --git a/grpc-google-cloud-asset-v1/pom.xml b/grpc-google-cloud-asset-v1/pom.xml
index 86658c21b..a7484c9b0 100644
--- a/grpc-google-cloud-asset-v1/pom.xml
+++ b/grpc-google-cloud-asset-v1/pom.xml
@@ -57,4 +57,13 @@
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file
diff --git a/grpc-google-cloud-asset-v1beta1/pom.xml b/grpc-google-cloud-asset-v1beta1/pom.xml
index 671c7ac38..673c37071 100644
--- a/grpc-google-cloud-asset-v1beta1/pom.xml
+++ b/grpc-google-cloud-asset-v1beta1/pom.xml
@@ -57,4 +57,13 @@
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file
diff --git a/grpc-google-cloud-asset-v1p1beta1/pom.xml b/grpc-google-cloud-asset-v1p1beta1/pom.xml
index 594d9090d..3de6785b0 100644
--- a/grpc-google-cloud-asset-v1p1beta1/pom.xml
+++ b/grpc-google-cloud-asset-v1p1beta1/pom.xml
@@ -53,4 +53,13 @@
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file
diff --git a/grpc-google-cloud-asset-v1p2beta1/pom.xml b/grpc-google-cloud-asset-v1p2beta1/pom.xml
index 38d5a346b..d4ed770a0 100644
--- a/grpc-google-cloud-asset-v1p2beta1/pom.xml
+++ b/grpc-google-cloud-asset-v1p2beta1/pom.xml
@@ -53,4 +53,13 @@
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file
diff --git a/grpc-google-cloud-asset-v1p4beta1/pom.xml b/grpc-google-cloud-asset-v1p4beta1/pom.xml
index 221f68dfb..15bddb144 100644
--- a/grpc-google-cloud-asset-v1p4beta1/pom.xml
+++ b/grpc-google-cloud-asset-v1p4beta1/pom.xml
@@ -57,4 +57,13 @@
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index fdc54b978..769dde129 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,18 +63,6 @@
UTF-8
github
google-cloud-asset-parent
- 1.93.5
- 1.9.2
- 1.18.0
- 0.13.0
- 1.56.0
- 1.30.0
- 3.12.2
- 4.13
- 29.0-android
- 1.4.4
- 1.3.2
- 1.18
@@ -136,67 +124,12 @@
- 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}
-
-
- com.google.cloud
- google-cloud-core
- ${google.core.version}
-
-
- com.google.api.grpc
- proto-google-iam-v1
- ${google.iam.version}
-
-
- org.threeten
- threetenbp
- ${threeten.version}
-
-
- javax.annotation
- javax.annotation-api
- ${javax.annotations.version}
-
-
- org.codehaus.mojo
- animal-sniffer-annotations
- ${animal-sniffer.version}
-
com.google.api.grpc
proto-google-cloud-orgpolicy-v1
@@ -211,7 +144,7 @@
junit
junit
- ${junit.version}
+ 4.13
test
@@ -232,13 +165,6 @@
0.117.2-alpha
test
-
- com.google.api
- gax-grpc
- ${gax.version}
- testlib
- test
-
@@ -334,7 +260,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-asset-v1/pom.xml b/proto-google-cloud-asset-v1/pom.xml
index 74f3f2c11..92201196c 100644
--- a/proto-google-cloud-asset-v1/pom.xml
+++ b/proto-google-cloud-asset-v1/pom.xml
@@ -42,4 +42,13 @@
proto-google-identity-accesscontextmanager-v1
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file
diff --git a/proto-google-cloud-asset-v1beta1/pom.xml b/proto-google-cloud-asset-v1beta1/pom.xml
index cad4c9bea..19ac82094 100644
--- a/proto-google-cloud-asset-v1beta1/pom.xml
+++ b/proto-google-cloud-asset-v1beta1/pom.xml
@@ -34,4 +34,13 @@
proto-google-iam-v1
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file
diff --git a/proto-google-cloud-asset-v1p1beta1/pom.xml b/proto-google-cloud-asset-v1p1beta1/pom.xml
index 29b4f2963..98ca4a328 100644
--- a/proto-google-cloud-asset-v1p1beta1/pom.xml
+++ b/proto-google-cloud-asset-v1p1beta1/pom.xml
@@ -26,4 +26,13 @@
proto-google-iam-v1
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file
diff --git a/proto-google-cloud-asset-v1p2beta1/pom.xml b/proto-google-cloud-asset-v1p2beta1/pom.xml
index 425af2d9f..ad2b6ed8d 100644
--- a/proto-google-cloud-asset-v1p2beta1/pom.xml
+++ b/proto-google-cloud-asset-v1p2beta1/pom.xml
@@ -34,4 +34,13 @@
proto-google-iam-v1
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file
diff --git a/proto-google-cloud-asset-v1p4beta1/pom.xml b/proto-google-cloud-asset-v1p4beta1/pom.xml
index d8a7da733..d0b27a7be 100644
--- a/proto-google-cloud-asset-v1p4beta1/pom.xml
+++ b/proto-google-cloud-asset-v1p4beta1/pom.xml
@@ -26,4 +26,13 @@
proto-google-iam-v1
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file