From a45e1b5675930e16fc892374d3e6e7db672ea479 Mon Sep 17 00:00:00 2001 From: yangnuoyu Date: Fri, 19 Jun 2020 11:50:49 -0700 Subject: [PATCH] feat(deps): adopt flatten plugin and google-cloud-shared-dependencies --- .gitignore | 2 + google-cloud-nio-examples/pom.xml | 4 ++ google-cloud-nio-retrofit/pom.xml | 4 ++ google-cloud-nio/pom.xml | 5 +++ pom.xml | 64 ++++++------------------------- 5 files changed, 26 insertions(+), 53 deletions(-) diff --git a/.gitignore b/.gitignore index 514cea304..83e19de62 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,5 @@ api_key *.pyc artman-genfiles venv + +.flattened-pom.xml diff --git a/google-cloud-nio-examples/pom.xml b/google-cloud-nio-examples/pom.xml index ed2780d6c..be1e7d4af 100644 --- a/google-cloud-nio-examples/pom.xml +++ b/google-cloud-nio-examples/pom.xml @@ -41,6 +41,10 @@ true + + org.codehaus.mojo + flatten-maven-plugin + diff --git a/google-cloud-nio-retrofit/pom.xml b/google-cloud-nio-retrofit/pom.xml index c96021776..4c72137a5 100644 --- a/google-cloud-nio-retrofit/pom.xml +++ b/google-cloud-nio-retrofit/pom.xml @@ -26,6 +26,10 @@ false + + org.codehaus.mojo + flatten-maven-plugin + \ No newline at end of file diff --git a/google-cloud-nio/pom.xml b/google-cloud-nio/pom.xml index a59c42741..4de63fa97 100644 --- a/google-cloud-nio/pom.xml +++ b/google-cloud-nio/pom.xml @@ -183,6 +183,11 @@ + + + org.codehaus.mojo + flatten-maven-plugin + diff --git a/pom.xml b/pom.xml index ae806a972..6ee505c67 100644 --- a/pom.xml +++ b/pom.xml @@ -72,14 +72,18 @@ UTF-8 github google-cloud-storage-nio-parent - 4.13 - 1.7.3 - 1.7.3 - 29.0-android + + com.google.cloud + google-cloud-shared-dependencies + 0.8.1 + pom + import + + com.google.cloud google-cloud-storage @@ -94,58 +98,18 @@ com.google.auto.value auto-value provided - ${auto-value.version} - - - com.google.protobuf - protobuf-bom - 3.12.2 - pom - import + ${auto-value-annotation.version} com.google.auto.value auto-value-annotations - ${auto-value-annotations.version} - - - com.google.cloud - google-cloud-core-bom - 1.93.6 - pom - import - - - com.google.api - gax-bom - 1.57.0 - pom - import - - - com.google.http-client - google-http-client-bom - 1.35.0 - pom - import - - - com.google.guava - guava-bom - ${guava.version} - pom - import - - - com.google.code.findbugs - jsr305 - 3.0.2 + ${auto-value-annotation.version} junit junit - ${junit.version} + 4.13 test @@ -154,12 +118,6 @@ 1.0.1 test - - com.google.guava - guava-testlib - ${guava.version} - test -