diff --git a/.gitignore b/.gitignore index dc2d514c..285bc965 100644 --- a/.gitignore +++ b/.gitignore @@ -42,4 +42,6 @@ api_key # Python utilities *.pyc artman-genfiles -venv \ No newline at end of file +venv + +.flattened-pom.xml \ No newline at end of file diff --git a/pom.xml b/pom.xml index 45d245d3..9437de96 100644 --- a/pom.xml +++ b/pom.xml @@ -60,68 +60,14 @@ grafeas - 1.29.0 - 1.30.9 - 1.93.5 - 1.56.0 - 1.35.0 - 29.0-android - 4.12 - 1.18.0 - 3.12.2 - 1.4.4 - 1.9.2 - 4.13 - - io.grpc - grpc-bom - ${grpc.version} - pom - import - - - com.google.api-client - google-api-client-bom - ${api-client.version} - pom - import - com.google.cloud - google-cloud-core-bom - ${google.core.version} - pom - import - - - com.google.api - gax-bom - ${gax.version} - pom - import - - - com.google.api - gax-bom - ${gax.version} - pom - import - - - com.google.http-client - google-http-client-bom - ${http-client-bom.version} - pom - import - - - com.google.guava - guava-bom - ${guava.version} + google-cloud-shared-dependencies + 0.8.1 pom import @@ -132,59 +78,49 @@ com.google.api.grpc proto-google-common-protos - ${google.common-protos.version} com.google.protobuf protobuf-java - ${protobuf.version} com.google.api gax-grpc - ${gax.version} com.google.guava guava - ${guava.version} com.google.api gax - ${gax.version} org.threeten threetenbp - ${threeten.version} io.grpc grpc-api - ${grpc.version} io.grpc grpc-protobuf - ${grpc.version} io.grpc grpc-stub - ${grpc.version} com.google.api api-common - ${google.api-common.version} junit junit - ${junit.version} + 4.13 test @@ -302,10 +238,19 @@ 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.9.0/apidocs/ + + + + + org.codehaus.mojo + flatten-maven-plugin + + +