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-recommendations-ai/pom.xml b/google-cloud-recommendations-ai/pom.xml index 5ce9d10c..82732934 100644 --- a/google-cloud-recommendations-ai/pom.xml +++ b/google-cloud-recommendations-ai/pom.xml @@ -98,4 +98,13 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/grpc-google-cloud-recommendations-ai-v1beta1/pom.xml b/grpc-google-cloud-recommendations-ai-v1beta1/pom.xml index 1da016b8..140053f2 100644 --- a/grpc-google-cloud-recommendations-ai-v1beta1/pom.xml +++ b/grpc-google-cloud-recommendations-ai-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 e5b77073..39798dfc 100644 --- a/pom.xml +++ b/pom.xml @@ -95,69 +95,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 +195,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-recommendations-ai-v1beta1/pom.xml b/proto-google-cloud-recommendations-ai-v1beta1/pom.xml index 09b66d70..d36afac3 100644 --- a/proto-google-cloud-recommendations-ai-v1beta1/pom.xml +++ b/proto-google-cloud-recommendations-ai-v1beta1/pom.xml @@ -30,4 +30,13 @@ guava + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file