diff --git a/.gitignore b/.gitignore index 48ec8bf666..ccf024c145 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ docs/ # Python utilities *.pyc + +.flattened-pom.xml diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index c0c3510391..ff76c61b3f 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -94,6 +94,11 @@ + + + org.codehaus.mojo + flatten-maven-plugin + diff --git a/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/grpc-google-cloud-spanner-admin-database-v1/pom.xml index 5233798d6b..eee25be70c 100644 --- a/grpc-google-cloud-spanner-admin-database-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-database-v1/pom.xml @@ -61,4 +61,14 @@ + + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml index 9f7c7b2040..7cd460a958 100644 --- a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml @@ -61,4 +61,14 @@ + + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml index ec1a6c0749..784dbbcd9f 100644 --- a/grpc-google-cloud-spanner-v1/pom.xml +++ b/grpc-google-cloud-spanner-v1/pom.xml @@ -53,4 +53,14 @@ + + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3eec2a499a..3e53f9b484 100644 --- a/pom.xml +++ b/pom.xml @@ -63,18 +63,6 @@ UTF-8 github google-cloud-spanner-parent - 1.93.4 - 1.9.0 - 1.17.0 - 1.56.0 - 1.29.0 - 3.11.4 - 4.13 - 29.0-android - 1.4.3 - 1.3.2 - 1.18 - 0.26.0 @@ -115,121 +103,13 @@ 1.53.0 - - io.grpc - grpc-bom - ${grpc.version} - pom - import - - - com.google.api - gax-bom - ${gax.version} - pom - import - - - com.google.guava - guava-bom - ${guava.version} - pom - import - com.google.cloud - google-cloud-core-bom - ${google.core.version} + google-cloud-shared-dependencies + 0.2.0 pom import - - com.google.auth - google-auth-library-bom - 0.20.0 - pom - import - - - com.google.protobuf - protobuf-bom - ${protobuf.version} - pom - import - - - com.google.http-client - google-http-client-bom - 1.34.2 - pom - import - - - - com.google.api - api-common - ${google.api-common.version} - - - com.google.api.grpc - proto-google-common-protos - ${google.common-protos.version} - - - com.google.api.grpc - grpc-google-common-protos - ${google.common-protos.version} - - - com.google.api.grpc - proto-google-iam-v1 - 0.13.0 - - - org.threeten - threetenbp - ${threeten.version} - - - javax.annotation - javax.annotation-api - ${javax.annotations.version} - - - org.codehaus.mojo - animal-sniffer-annotations - ${animal-sniffer.version} - - - io.opencensus - opencensus-api - ${opencensus.version} - - - io.opencensus - opencensus-contrib-grpc-util - ${opencensus.version} - - - - junit - junit - ${junit.version} - test - - - com.google.api - gax-grpc - ${gax.version} - testlib - test - - - com.google.truth - truth - 1.0.1 - test - @@ -307,7 +187,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/1.8.1/apidocs/ diff --git a/proto-google-cloud-spanner-admin-database-v1/pom.xml b/proto-google-cloud-spanner-admin-database-v1/pom.xml index 35feaa57cc..77eb238bf2 100644 --- a/proto-google-cloud-spanner-admin-database-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-database-v1/pom.xml @@ -34,4 +34,14 @@ proto-google-iam-v1 + + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/proto-google-cloud-spanner-admin-instance-v1/pom.xml index 126b1b5e3a..738ccd42c5 100644 --- a/proto-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-instance-v1/pom.xml @@ -34,4 +34,14 @@ proto-google-iam-v1 + + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/proto-google-cloud-spanner-v1/pom.xml b/proto-google-cloud-spanner-v1/pom.xml index 8326a81ab6..8efb3a4677 100644 --- a/proto-google-cloud-spanner-v1/pom.xml +++ b/proto-google-cloud-spanner-v1/pom.xml @@ -30,4 +30,14 @@ guava + + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file