diff --git a/.gitignore b/.gitignore index fadd6afc..069d08fc 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ target/ # python utilities *.pyc __pycache__ + +.flattened-pom.xml diff --git a/google-cloud-websecurityscanner/pom.xml b/google-cloud-websecurityscanner/pom.xml index 54c61760..1975074f 100644 --- a/google-cloud-websecurityscanner/pom.xml +++ b/google-cloud-websecurityscanner/pom.xml @@ -126,4 +126,13 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/grpc-google-cloud-websecurityscanner-v1/pom.xml b/grpc-google-cloud-websecurityscanner-v1/pom.xml index 80d493c7..46f2a206 100644 --- a/grpc-google-cloud-websecurityscanner-v1/pom.xml +++ b/grpc-google-cloud-websecurityscanner-v1/pom.xml @@ -53,4 +53,13 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml b/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml index dfddbb8c..6f308255 100644 --- a/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml +++ b/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml @@ -53,4 +53,13 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/grpc-google-cloud-websecurityscanner-v1beta/pom.xml b/grpc-google-cloud-websecurityscanner-v1beta/pom.xml index 625b8a90..4b2bb446 100644 --- a/grpc-google-cloud-websecurityscanner-v1beta/pom.xml +++ b/grpc-google-cloud-websecurityscanner-v1beta/pom.xml @@ -53,4 +53,13 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 452a9032..a16e2809 100644 --- a/pom.xml +++ b/pom.xml @@ -63,19 +63,6 @@ UTF-8 github google-cloud-websecurityscanner-parent - 1.93.0 - 1.9.2 - 1.18.0 - 0.20.0 - 1.57.0 - 1.30.0 - 3.12.2 - 4.13 - 29.0-android - 1.4.4 - 1.3.2 - 1.18 - 2.10.6 @@ -117,82 +104,23 @@ - com.google.auth - google-auth-library-bom - ${google.auth.version} - pom - import - - - 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} + 4.13 test joda-time joda-time - ${joda.version} - test - - - com.google.api - gax-grpc - ${gax.version} - testlib + 2.10.6 test @@ -286,7 +214,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-websecurityscanner-v1/pom.xml b/proto-google-cloud-websecurityscanner-v1/pom.xml index 808988a5..7d70abc3 100644 --- a/proto-google-cloud-websecurityscanner-v1/pom.xml +++ b/proto-google-cloud-websecurityscanner-v1/pom.xml @@ -30,4 +30,13 @@ guava + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/proto-google-cloud-websecurityscanner-v1alpha/pom.xml b/proto-google-cloud-websecurityscanner-v1alpha/pom.xml index 2467affe..f1d55c98 100644 --- a/proto-google-cloud-websecurityscanner-v1alpha/pom.xml +++ b/proto-google-cloud-websecurityscanner-v1alpha/pom.xml @@ -30,4 +30,13 @@ guava + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/proto-google-cloud-websecurityscanner-v1beta/pom.xml b/proto-google-cloud-websecurityscanner-v1beta/pom.xml index 56d84312..c0d8064f 100644 --- a/proto-google-cloud-websecurityscanner-v1beta/pom.xml +++ b/proto-google-cloud-websecurityscanner-v1beta/pom.xml @@ -30,4 +30,13 @@ guava + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file