From 31a94aa465e850258a23637588cc89db9f726825 Mon Sep 17 00:00:00 2001
From: yangnuoyu <46553752+yangnuoyu@users.noreply.github.com>
Date: Tue, 16 Jun 2020 20:42:02 -0700
Subject: [PATCH] feat(deps): adopt flatten plugin and
google-cloud-shared-dependencies (#228)
---
.gitignore | 2 +
google-cloud-dataproc/pom.xml | 9 +++
grpc-google-cloud-dataproc-v1/pom.xml | 9 +++
grpc-google-cloud-dataproc-v1beta2/pom.xml | 9 +++
pom.xml | 78 ++-------------------
proto-google-cloud-dataproc-v1/pom.xml | 9 +++
proto-google-cloud-dataproc-v1beta2/pom.xml | 9 +++
7 files changed, 52 insertions(+), 73 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6196f7a8..1956161c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,5 @@ api_key
# Python utilities
*.pyc
artman-genfiles
+
+.flattened-pom.xml
diff --git a/google-cloud-dataproc/pom.xml b/google-cloud-dataproc/pom.xml
index 968355cf..601bcb69 100644
--- a/google-cloud-dataproc/pom.xml
+++ b/google-cloud-dataproc/pom.xml
@@ -112,4 +112,13 @@
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file
diff --git a/grpc-google-cloud-dataproc-v1/pom.xml b/grpc-google-cloud-dataproc-v1/pom.xml
index 0b7cc7df..2e848e89 100644
--- a/grpc-google-cloud-dataproc-v1/pom.xml
+++ b/grpc-google-cloud-dataproc-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-dataproc-v1beta2/pom.xml b/grpc-google-cloud-dataproc-v1beta2/pom.xml
index f95d98b8..dcda7342 100644
--- a/grpc-google-cloud-dataproc-v1beta2/pom.xml
+++ b/grpc-google-cloud-dataproc-v1beta2/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 017e2685..fcceb16d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,17 +63,6 @@
UTF-8
github
google-cloud-dataproc-parent
- 1.93.5
- 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
@@ -105,74 +94,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}
-
-
- 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}
-
-
junit
junit
- ${junit.version}
- test
-
-
- com.google.api
- gax-grpc
- ${gax.version}
- testlib
+ 4.13
test
@@ -264,7 +196,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-dataproc-v1/pom.xml b/proto-google-cloud-dataproc-v1/pom.xml
index 635c41ba..6f0435bb 100644
--- a/proto-google-cloud-dataproc-v1/pom.xml
+++ b/proto-google-cloud-dataproc-v1/pom.xml
@@ -30,4 +30,13 @@
guava
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file
diff --git a/proto-google-cloud-dataproc-v1beta2/pom.xml b/proto-google-cloud-dataproc-v1beta2/pom.xml
index 1c111896..cc143298 100644
--- a/proto-google-cloud-dataproc-v1beta2/pom.xml
+++ b/proto-google-cloud-dataproc-v1beta2/pom.xml
@@ -30,4 +30,13 @@
guava
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+
\ No newline at end of file