From de0bb1895f223fc8dbeb3f22ffb4967b3f0094d2 Mon Sep 17 00:00:00 2001 From: yangnuoyu <46553752+yangnuoyu@users.noreply.github.com> Date: Wed, 17 Jun 2020 19:13:31 -0700 Subject: [PATCH] feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (#85) --- .gitignore | 4 +- google-cloud-mediatranslation/pom.xml | 9 +++ .../pom.xml | 9 +++ pom.xml | 73 ++----------------- .../pom.xml | 9 +++ 5 files changed, 35 insertions(+), 69 deletions(-) diff --git a/.gitignore b/.gitignore index bbec058d..069d08fc 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,6 @@ target/ # python utilities *.pyc -__pycache__ \ No newline at end of file +__pycache__ + +.flattened-pom.xml diff --git a/google-cloud-mediatranslation/pom.xml b/google-cloud-mediatranslation/pom.xml index 2305a0cc..2d2cb570 100644 --- a/google-cloud-mediatranslation/pom.xml +++ b/google-cloud-mediatranslation/pom.xml @@ -98,4 +98,13 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/grpc-google-cloud-mediatranslation-v1beta1/pom.xml b/grpc-google-cloud-mediatranslation-v1beta1/pom.xml index 9ef48c45..da81bb6f 100644 --- a/grpc-google-cloud-mediatranslation-v1beta1/pom.xml +++ b/grpc-google-cloud-mediatranslation-v1beta1/pom.xml @@ -49,4 +49,13 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 62adc3d7..8dbb42ed 100644 --- a/pom.xml +++ b/pom.xml @@ -63,17 +63,6 @@ UTF-8 github google-cloud-mediatranslation-parent - 1.91.1 - 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 @@ -95,69 +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} + 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} - - - 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 @@ -247,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-mediatranslation-v1beta1/pom.xml b/proto-google-cloud-mediatranslation-v1beta1/pom.xml index 2814e228..97c6df3e 100644 --- a/proto-google-cloud-mediatranslation-v1beta1/pom.xml +++ b/proto-google-cloud-mediatranslation-v1beta1/pom.xml @@ -22,4 +22,13 @@ proto-google-common-protos + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file