diff --git a/.gitignore b/.gitignore index fadd6afc..cc0bc34a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ target/ # python utilities *.pyc __pycache__ + +.flattened-pom.xml \ No newline at end of file diff --git a/google-cloud-datacatalog/pom.xml b/google-cloud-datacatalog/pom.xml index a36c38f2..c36d3f8f 100644 --- a/google-cloud-datacatalog/pom.xml +++ b/google-cloud-datacatalog/pom.xml @@ -116,4 +116,13 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/grpc-google-cloud-datacatalog-v1/pom.xml b/grpc-google-cloud-datacatalog-v1/pom.xml index 6ecbee4d..f9e29b00 100644 --- a/grpc-google-cloud-datacatalog-v1/pom.xml +++ b/grpc-google-cloud-datacatalog-v1/pom.xml @@ -57,4 +57,13 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/grpc-google-cloud-datacatalog-v1beta1/pom.xml b/grpc-google-cloud-datacatalog-v1beta1/pom.xml index 331e40ba..6beaf60e 100644 --- a/grpc-google-cloud-datacatalog-v1beta1/pom.xml +++ b/grpc-google-cloud-datacatalog-v1beta1/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 6d44e590..7d9f9e88 100644 --- a/pom.xml +++ b/pom.xml @@ -63,18 +63,6 @@ UTF-8 github google-cloud-datacatalog-parent - 1.93.6 - 1.9.2 - 1.18.0 - 0.13.0 - 1.57.0 - 1.30.0 - 3.12.2 - 4.13 - 29.0-android - 1.4.4 - 1.3.2 - 1.18 @@ -106,79 +94,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} - - - com.google.api.grpc - proto-google-iam-v1 - ${google.iam.version} - - - com.google.cloud - google-cloud-core - ${google.core.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 diff --git a/proto-google-cloud-datacatalog-v1/pom.xml b/proto-google-cloud-datacatalog-v1/pom.xml index ce5b3d34..4da1f96f 100644 --- a/proto-google-cloud-datacatalog-v1/pom.xml +++ b/proto-google-cloud-datacatalog-v1/pom.xml @@ -34,4 +34,13 @@ guava + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/proto-google-cloud-datacatalog-v1beta1/pom.xml b/proto-google-cloud-datacatalog-v1beta1/pom.xml index 6e150f13..b0de2995 100644 --- a/proto-google-cloud-datacatalog-v1beta1/pom.xml +++ b/proto-google-cloud-datacatalog-v1beta1/pom.xml @@ -34,4 +34,13 @@ guava + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file