diff --git a/.gitignore b/.gitignore index fadd6af..069d08f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ target/ # python utilities *.pyc __pycache__ + +.flattened-pom.xml diff --git a/pom.xml b/pom.xml index 2ab403c..62b41ee 100644 --- a/pom.xml +++ b/pom.xml @@ -63,28 +63,22 @@ UTF-8 github google-cloud-orgpolicy-parent - 1.18.0 - 3.12.2 - 4.13 - com.google.protobuf - protobuf-java - ${protobuf.version} - - - com.google.api.grpc - proto-google-common-protos - ${google.common-protos.version} + com.google.cloud + google-cloud-shared-dependencies + 0.8.1 + pom + import junit junit - ${junit.version} + 4.13 test @@ -157,7 +151,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-orgpolicy-v1/pom.xml b/proto-google-cloud-orgpolicy-v1/pom.xml index f7dc812..1889ff8 100644 --- a/proto-google-cloud-orgpolicy-v1/pom.xml +++ b/proto-google-cloud-orgpolicy-v1/pom.xml @@ -22,4 +22,13 @@ proto-google-common-protos + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file