From b50508137a3c009269371d91b3bbf4145db08818 Mon Sep 17 00:00:00 2001 From: yangnuoyu <46553752+yangnuoyu@users.noreply.github.com> Date: Mon, 22 Jun 2020 11:09:22 -0700 Subject: [PATCH] feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#191) --- java-resourcemanager/.gitignore | 4 +- java-resourcemanager/pom.xml | 76 ++++----------------------------- 2 files changed, 11 insertions(+), 69 deletions(-) diff --git a/java-resourcemanager/.gitignore b/java-resourcemanager/.gitignore index 18ac2c6bad42..1956161c30ce 100644 --- a/java-resourcemanager/.gitignore +++ b/java-resourcemanager/.gitignore @@ -41,4 +41,6 @@ api_key # Python utilities *.pyc -artman-genfiles \ No newline at end of file +artman-genfiles + +.flattened-pom.xml diff --git a/java-resourcemanager/pom.xml b/java-resourcemanager/pom.xml index 571b97f660f9..0e7cb8fd89f2 100644 --- a/java-resourcemanager/pom.xml +++ b/java-resourcemanager/pom.xml @@ -63,21 +63,6 @@ UTF-8 github google-cloud-resourcemanager-parent - 1.93.5 - 1.9.2 - 1.56.0 - 4.13 - 29.0-android - 1.4.4 - 1.93.5 - 1.30.9 - 3.6 - 1.10.19 - 2.6 - 0.20.0 - 1.35.0 - 3.12.2 - 2.3.4 @@ -87,59 +72,17 @@ google-cloud-resourcemanager 0.117.3-alpha-SNAPSHOT - - com.google.api - gax-bom - ${gax.version} - pom - import - - - com.google.guava - guava-bom - ${guava.version} - pom - import - - - com.google.api-client - google-api-client-bom - ${api-client.version} - pom - import - - - com.google.auth - google-auth-library-bom - ${google.auth.version} - pom - import - - - com.google.http-client - google-http-client-bom - ${http-client-bom.version} - pom - import - - - com.google.protobuf - protobuf-bom - ${protobuf.version} - pom - import - com.google.cloud - google-cloud-core-bom - ${google.core.version} + google-cloud-shared-dependencies + 0.8.1 pom import com.google.errorprone error_prone_annotations - ${errorprone.version} + 2.3.4 @@ -147,12 +90,10 @@ com.google.api api-common - ${google.api-common.version} org.threeten threetenbp - ${threeten.version} com.google.apis @@ -191,13 +132,13 @@ junit junit - ${junit.version} + 4.13 test org.easymock easymock - ${easymock.version} + 3.6 test @@ -209,19 +150,18 @@ org.mockito mockito-all - ${mockito.version} + 1.10.19 test org.objenesis objenesis - ${objenesis.version} + 2.6 test com.google.cloud google-cloud-core - ${google.core-http.version} test test-jar @@ -304,7 +244,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/