diff --git a/.gitignore b/.gitignore index 3ca4b1fa..88e95bf2 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,5 @@ docs/ # Python utilities *.pyc + +.flattened-pom.xml diff --git a/google-cloud-monitoring/pom.xml b/google-cloud-monitoring/pom.xml index 177f7541..18ecbdf2 100644 --- a/google-cloud-monitoring/pom.xml +++ b/google-cloud-monitoring/pom.xml @@ -105,4 +105,13 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + diff --git a/grpc-google-cloud-monitoring-v3/pom.xml b/grpc-google-cloud-monitoring-v3/pom.xml index c2e96074..2a9e14bf 100644 --- a/grpc-google-cloud-monitoring-v3/pom.xml +++ b/grpc-google-cloud-monitoring-v3/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 266807d9..fc869a28 100644 --- a/pom.xml +++ b/pom.xml @@ -63,17 +63,6 @@ UTF-8 github google-cloud-monitoring-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-monitoring-v3/pom.xml b/proto-google-cloud-monitoring-v3/pom.xml index c64640a1..d45a9d4d 100644 --- a/proto-google-cloud-monitoring-v3/pom.xml +++ b/proto-google-cloud-monitoring-v3/pom.xml @@ -30,4 +30,13 @@ guava + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 43f40d50..55f90faa 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -32,6 +32,11 @@ 1.100.2-SNAPSHOT + + com.google.protobuf + protobuf-java-util + 3.12.2 + diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 704e87db..de3cbae9 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -30,6 +30,11 @@ google-cloud-monitoring 1.100.1 + + com.google.protobuf + protobuf-java-util + 3.12.2 + junit diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 9cb5aef6..a6a6c5f8 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -43,7 +43,11 @@ google-cloud-monitoring - + + com.google.protobuf + protobuf-java-util + 3.12.2 + junit junit