diff --git a/.gitignore b/.gitignore index fadd6afc2..069d08fc7 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ target/ # python utilities *.pyc __pycache__ + +.flattened-pom.xml diff --git a/google-cloud-speech/pom.xml b/google-cloud-speech/pom.xml index d5aa23f35..8da9407ea 100644 --- a/google-cloud-speech/pom.xml +++ b/google-cloud-speech/pom.xml @@ -111,4 +111,13 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + diff --git a/grpc-google-cloud-speech-v1/pom.xml b/grpc-google-cloud-speech-v1/pom.xml index 78f7da400..159782793 100644 --- a/grpc-google-cloud-speech-v1/pom.xml +++ b/grpc-google-cloud-speech-v1/pom.xml @@ -57,4 +57,13 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + diff --git a/grpc-google-cloud-speech-v1beta1/pom.xml b/grpc-google-cloud-speech-v1beta1/pom.xml index 222a1c5eb..2bff2e118 100644 --- a/grpc-google-cloud-speech-v1beta1/pom.xml +++ b/grpc-google-cloud-speech-v1beta1/pom.xml @@ -57,4 +57,13 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + diff --git a/grpc-google-cloud-speech-v1p1beta1/pom.xml b/grpc-google-cloud-speech-v1p1beta1/pom.xml index d5cdbb7ba..91f630a96 100644 --- a/grpc-google-cloud-speech-v1p1beta1/pom.xml +++ b/grpc-google-cloud-speech-v1p1beta1/pom.xml @@ -57,4 +57,13 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + diff --git a/pom.xml b/pom.xml index c326ed8ae..38fae1812 100644 --- a/pom.xml +++ b/pom.xml @@ -151,18 +151,6 @@ UTF-8 github google-cloud-speech-parent - 1.93.6 - 1.9.2 - 1.18.0 - 1.57.0 - 1.30.0 - 3.12.2 - 4.13 - 29.0-android - 1.4.4 - 1.3.2 - 1.18 - 2.4.0 @@ -199,79 +187,22 @@ - 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.cloud - google-cloud-core-grpc - ${google.core.version} - - - 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} - com.google.errorprone error_prone_annotations - ${errorprone.version} + 2.4.0 junit junit - ${junit.version} - test - - - com.google.api - gax-grpc - ${gax.version} - testlib + 4.13 test @@ -371,7 +302,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-speech-v1/pom.xml b/proto-google-cloud-speech-v1/pom.xml index f37ff7804..d4033ae41 100644 --- a/proto-google-cloud-speech-v1/pom.xml +++ b/proto-google-cloud-speech-v1/pom.xml @@ -24,4 +24,13 @@ compile + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/proto-google-cloud-speech-v1beta1/pom.xml b/proto-google-cloud-speech-v1beta1/pom.xml index e8af045b2..0f5e416e2 100644 --- a/proto-google-cloud-speech-v1beta1/pom.xml +++ b/proto-google-cloud-speech-v1beta1/pom.xml @@ -24,4 +24,13 @@ compile + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/proto-google-cloud-speech-v1p1beta1/pom.xml b/proto-google-cloud-speech-v1p1beta1/pom.xml index a48289da7..f2552351e 100644 --- a/proto-google-cloud-speech-v1p1beta1/pom.xml +++ b/proto-google-cloud-speech-v1p1beta1/pom.xml @@ -32,4 +32,13 @@ api-common + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file