From d001d6fbd62cab4d4264fc34df73684d0cdbd0e0 Mon Sep 17 00:00:00 2001
From: yangnuoyu <46553752+yangnuoyu@users.noreply.github.com>
Date: Fri, 26 Jun 2020 10:16:53 -0700
Subject: [PATCH] feat(deps): adopt flatten plugin and
google-cloud-shared-dependencies (#206)
---
.gitignore | 4 +-
google-cloud-container/pom.xml | 9 +++
grpc-google-cloud-container-v1/pom.xml | 9 +++
pom.xml | 84 ++-----------------------
proto-google-cloud-container-v1/pom.xml | 9 +++
5 files changed, 35 insertions(+), 80 deletions(-)
diff --git a/.gitignore b/.gitignore
index dc2d514c..598779ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,4 +42,6 @@ api_key
# Python utilities
*.pyc
artman-genfiles
-venv
\ No newline at end of file
+venv
+
+.flattened-pom.xml
diff --git a/google-cloud-container/pom.xml b/google-cloud-container/pom.xml
index 8b2ad99c..8bc57b12 100644
--- a/google-cloud-container/pom.xml
+++ b/google-cloud-container/pom.xml
@@ -102,4 +102,13 @@
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file
diff --git a/grpc-google-cloud-container-v1/pom.xml b/grpc-google-cloud-container-v1/pom.xml
index bc454598..42b7aafb 100644
--- a/grpc-google-cloud-container-v1/pom.xml
+++ b/grpc-google-cloud-container-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 93debf07..efdecc6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,17 +63,6 @@
UTF-8
github
google-cloud-container-parent
- 1.93.6
- 1.9.2
- 1.18.0
- 1.57.0
- 1.30.2
- 3.12.2
- 4.13
- 29.0-android
- 1.4.4
- 1.3.2
- 1.18
@@ -95,80 +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}
- pom
- import
-
-
- com.google.protobuf
- protobuf-bom
- ${protobuf.version}
+ com.google.cloud
+ google-cloud-shared-dependencies
+ 0.8.1
pom
import
-
- 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}
-
-
- org.threeten
- threetenbp
- ${threeten.version}
-
-
- javax.annotation
- javax.annotation-api
- ${javax.annotations.version}
-
-
- org.codehaus.mojo
- animal-sniffer-annotations
- ${animal-sniffer.version}
-
-
- com.google.code.gson
- gson
- 2.8.6
-
junit
junit
- ${junit.version}
- test
-
-
- com.google.api
- gax-grpc
- ${gax.version}
- testlib
+ 4.13
test
@@ -258,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-container-v1/pom.xml b/proto-google-cloud-container-v1/pom.xml
index 37108d65..e608c47f 100644
--- a/proto-google-cloud-container-v1/pom.xml
+++ b/proto-google-cloud-container-v1/pom.xml
@@ -22,4 +22,13 @@
proto-google-common-protos
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file