From c7f8688f8a74ff79ed9795abb6221aa2dcdaa53d Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 26 Nov 2019 12:34:49 -0800 Subject: [PATCH 1/3] Extract BOM to https://github.com/googleapis/java-cloud-bom --- google-cloud-bom/README.md | 45 +- google-cloud-bom/pom.xml | 1005 ---------------------------- google-cloud-bom/src/site/site.xml | 32 - pom.xml | 2 - 4 files changed, 2 insertions(+), 1082 deletions(-) delete mode 100644 google-cloud-bom/pom.xml delete mode 100644 google-cloud-bom/src/site/site.xml diff --git a/google-cloud-bom/README.md b/google-cloud-bom/README.md index 4da0eb115c71..31a371606845 100644 --- a/google-cloud-bom/README.md +++ b/google-cloud-bom/README.md @@ -1,44 +1,3 @@ -Google Cloud Bill of Materials -============================== +# Google Cloud Bill of Materials -The `google-cloud-bom` module is basically a pom that can be used to import consistent versions of google-cloud-java -components plus its dependencies. - -To use it in Maven, add the following to your POM: - -[//]: # ({x-version-update-start:google-cloud-bom:released}) -```xml - - - - com.google.cloud - google-cloud-bom - 0.119.0-alpha - pom - import - - - -``` -[//]: # ({x-version-update-end}) - -Contributing ------------- - -Contributions to this library are always welcome and highly encouraged. - -See `google-cloud`'s [CONTRIBUTING] documentation and the [shared documentation](https://github.com/googleapis/google-cloud-common/blob/master/contributing/readme.md#how-to-contribute-to-gcloud) for more information on how to get started. - -Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information. - -License -------- - -Apache 2.0 - See [LICENSE] for more information. - - -[CONTRIBUTING]:https://github.com/googleapis/google-cloud-java/blob/master/CONTRIBUTING.md -[code-of-conduct]:https://github.com/googleapis/google-cloud-java/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct -[LICENSE]: https://github.com/googleapis/google-cloud-java/blob/master/LICENSE -[TESTING]: https://github.com/googleapis/google-cloud-java/blob/master/TESTING.md -[cloud-platform]: https://cloud.google.com/ +The BOM configuration has moved to https://github.com/googleapis/java-cloud-bom \ No newline at end of file diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml deleted file mode 100644 index cf0a69a6f188..000000000000 --- a/google-cloud-bom/pom.xml +++ /dev/null @@ -1,1005 +0,0 @@ - - - 4.0.0 - com.google.cloud - google-cloud-bom - pom - 0.119.1-alpha-SNAPSHOT - Google Cloud Java BOM - https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-bom - - BOM for google-cloud-java - - - - garrettjonesgoogle - Garrett Jones - garrettjones@google.com - Google - - Developer - - - - pongad - Michael Darakananda - pongad@google.com - Google - - Developer - - - - shinfan - Shin Fan - shinfan@google.com - Google - - Developer - - - - michaelbausor - Micheal Bausor - michaelbausor@google.com - Google - - Developer - - - - vam-google - Vadym Matsishevskyi - vam@google.com - Google - - Developer - - - - tswast - Tim Swast - tswast@google.com - Google - - Developer - - - - neozwu - Neo Wu - neowu@google.com - Google - - Developer - - - - lesv - Les Vogel - lesv@google.com - Google - - Developer - - - - schmidt_sebastian - Sebastian Schmidt - mrschmidt@google.com - Google - - Developer - - - - andreamlin - Andrea Lin - andrealin@google.com - - Developer - - - - hzyi-google - Hanzhen Yi - hzyi@google.com - - Developer - - - - jart - Justine Tunney - jart@google.com - Google - - Developer - - - - jean-philippe-martin - Jean-Philippe Martin - jpmartin@verily.com - Verily - - Developer - - - - - Google - - - scm:git:git@github.com:googleapis/google-cloud-java.git - scm:git:git@github.com:googleapis/google-cloud-java.git - https://github.com/googleapis/google-cloud-java - HEAD - - - - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - - sonatype-nexus-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - github-pages-site - Deployment through GitHub's site deployment plugin - site/google-cloud-bom - - - - - Google Cloud Software License - https://raw.githubusercontent.com/googleapis/google-cloud-java/master/LICENSE - - - - - - - com.google.api - api-common - 1.8.1 - - - com.google.api - gax-bom - 1.49.1 - pom - import - - - com.google.api.grpc - proto-google-common-protos - 1.17.0 - - - com.google.api.grpc - grpc-google-common-protos - 1.17.0 - - - com.google.api.grpc - proto-google-iam-v1 - 0.13.0 - - - com.google.api.grpc - grpc-google-iam-v1 - 0.13.0 - - - - - com.google.cloud - google-cloud-asset-bom - 0.115.0-beta - pom - import - - - com.google.cloud - google-cloud-automl-bom - 0.114.1-beta - pom - import - - - com.google.cloud - google-cloud-bigtable - 1.6.0 - - - com.google.api.grpc - proto-google-cloud-bigtable-v2 - 0.82.0 - - - com.google.api.grpc - grpc-google-cloud-bigtable-v2 - 0.82.0 - - - com.google.api.grpc - proto-google-cloud-bigtable-admin-v2 - 0.82.0 - - - com.google.api.grpc - grpc-google-cloud-bigtable-admin-v2 - 0.82.0 - - - com.google.cloud - google-cloud-bigtable-emulator - 0.115.0 - - - com.google.cloud - google-cloud-bigquery - 1.101.1-SNAPSHOT - - - com.google.cloud - google-cloud-bigquerydatatransfer - 0.119.1-beta-SNAPSHOT - - - com.google.api.grpc - proto-google-cloud-bigquerydatatransfer-v1 - 0.84.1-SNAPSHOT - - - com.google.api.grpc - grpc-google-cloud-bigquerydatatransfer-v1 - 0.84.1-SNAPSHOT - - - com.google.cloud - google-cloud-bigquerystorage - 0.118.0-beta - - - com.google.api.grpc - proto-google-cloud-bigquerystorage-v1beta1 - 0.84.1-SNAPSHOT - - - com.google.api.grpc - grpc-google-cloud-bigquerystorage-v1beta1 - 0.84.1-SNAPSHOT - - - com.google.cloud - google-cloud-compute - 0.117.0-alpha - - - com.google.cloud - google-cloud-container - 0.117.0-beta - - - com.google.api.grpc - proto-google-cloud-container-v1 - 0.82.0 - - - com.google.api.grpc - grpc-google-cloud-container-v1 - 0.82.0 - - - com.google.cloud - google-cloud-containeranalysis - 0.117.0-beta - - - com.google.api.grpc - proto-google-cloud-containeranalysis-v1 - 0.82.0 - - - com.google.api.grpc - grpc-google-cloud-containeranalysis-v1 - 0.82.0 - - - com.google.api.grpc - proto-google-cloud-containeranalysis-v1beta1 - 0.82.0 - - - com.google.api.grpc - grpc-google-cloud-containeranalysis-v1beta1 - 0.82.0 - - - com.google.cloud - google-cloud-contrib - 0.119.1-alpha-SNAPSHOT - - - com.google.cloud - google-cloud-nio - 0.119.1-alpha-SNAPSHOT - - - com.google.cloud - google-cloud-core-bom - 1.91.3 - pom - import - - - com.google.cloud - google-cloud-datacatalog-bom - 0.29.0-alpha - pom - import - - - com.google.cloud - google-cloud-datalabeling-bom - 0.116.1-alpha - pom - import - - - com.google.cloud - google-cloud-dataproc - 0.117.0 - - - com.google.api.grpc - proto-google-cloud-dataproc-v1 - 0.82.0 - - - com.google.api.grpc - grpc-google-cloud-dataproc-v1 - 0.82.0 - - - com.google.api.grpc - proto-google-cloud-dataproc-v1beta2 - 0.82.0 - - - com.google.api.grpc - grpc-google-cloud-dataproc-v1beta2 - 0.82.0 - - - com.google.cloud - google-cloud-datastore - 1.101.1-SNAPSHOT - - - com.google.api.grpc - proto-google-cloud-datastore-v1 - 0.84.1-SNAPSHOT - - - com.google.cloud - google-cloud-dlp-bom - 0.116.0-beta - pom - import - - - com.google.cloud - google-cloud-dialogflow - 0.117.0-alpha - - - com.google.api.grpc - proto-google-cloud-dialogflow-v2beta1 - 0.82.0 - - - com.google.api.grpc - grpc-google-cloud-dialogflow-v2beta1 - 0.82.0 - - - com.google.api.grpc - proto-google-cloud-dialogflow-v2 - 0.82.0 - - - com.google.api.grpc - grpc-google-cloud-dialogflow-v2 - 0.82.0 - - - com.google.cloud - google-cloud-dns - 0.117.0-alpha - - - com.google.cloud - google-cloud-errorreporting - 0.117.0-beta - - - com.google.api.grpc - proto-google-cloud-error-reporting-v1beta1 - 0.82.0 - - - com.google.api.grpc - grpc-google-cloud-error-reporting-v1beta1 - 0.82.0 - - - com.google.cloud - google-cloud-firestore - 1.31.0 - - - com.google.api.grpc - proto-google-cloud-firestore-admin-v1 - 1.31.0 - - - com.google.api.grpc - proto-google-cloud-firestore-v1 - 1.31.0 - - - com.google.api.grpc - proto-google-cloud-firestore-v1beta1 - 0.84.0 - - - com.google.api.grpc - grpc-google-cloud-firestore-admin-v1 - 1.31.0 - - - com.google.api.grpc - grpc-google-cloud-firestore-v1 - 1.31.0 - - - com.google.api.grpc - grpc-google-cloud-firestore-v1beta1 - 0.84.0 - - - com.google.cloud - google-cloud-kms - 1.34.0 - - - com.google.api.grpc - proto-google-cloud-kms-v1 - 0.81.0 - - - com.google.api.grpc - grpc-google-cloud-kms-v1 - 0.81.0 - - - com.google.cloud - google-cloud-language - 1.98.0 - - - com.google.api.grpc - proto-google-cloud-language-v1 - 1.80.0 - - - com.google.api.grpc - grpc-google-cloud-language-v1 - 1.80.0 - - - com.google.api.grpc - proto-google-cloud-language-v1beta2 - 0.81.0 - - - com.google.api.grpc - grpc-google-cloud-language-v1beta2 - 0.81.0 - - - com.google.cloud - google-cloud-logging - 1.98.0 - - - com.google.api.grpc - proto-google-cloud-logging-v2 - 0.81.0 - - - com.google.api.grpc - grpc-google-cloud-logging-v2 - 0.81.0 - - - com.google.cloud - google-cloud-logging-logback - 0.116.0-alpha - - - - com.google.cloud - google-cloud-monitoring - 1.98.0 - - - com.google.api.grpc - proto-google-cloud-monitoring-v3 - 1.80.0 - - - com.google.api.grpc - grpc-google-cloud-monitoring-v3 - 1.80.0 - - - com.google.cloud - google-cloud-os-login - 0.116.0-alpha - - - com.google.api.grpc - proto-google-cloud-os-login-v1 - 0.81.0 - - - com.google.api.grpc - grpc-google-cloud-os-login-v1 - 0.81.0 - - - com.google.cloud - google-cloud-pubsub - 1.101.0 - - - com.google.api.grpc - proto-google-cloud-pubsub-v1 - 1.83.0 - - - com.google.api.grpc - grpc-google-cloud-pubsub-v1 - 1.83.0 - - - com.google.cloud - google-cloud-redis - 0.116.0-alpha - - - com.google.api.grpc - proto-google-cloud-redis-v1beta1 - 0.81.0 - - - com.google.api.grpc - grpc-google-cloud-redis-v1beta1 - 0.81.0 - - - com.google.api.grpc - proto-google-cloud-redis-v1 - 0.81.0 - - - com.google.api.grpc - grpc-google-cloud-redis-v1 - 0.81.0 - - - com.google.cloud - google-cloud-resourcemanager - 0.116.0-alpha - - - com.google.cloud - google-cloud-scheduler - 1.21.0 - - - com.google.api.grpc - proto-google-cloud-scheduler-v1beta1 - 0.81.0 - - - com.google.api.grpc - grpc-google-cloud-scheduler-v1beta1 - 0.81.0 - - - com.google.cloud - google-cloud-securitycenter - 0.117.0 - - - com.google.api.grpc - grpc-google-cloud-scheduler-v1 - 1.21.0 - - - com.google.api.grpc - proto-google-cloud-scheduler-v1 - 1.21.0 - - - com.google.api.grpc - proto-google-cloud-securitycenter-v1beta1 - 0.82.0 - - - com.google.api.grpc - grpc-google-cloud-securitycenter-v1beta1 - 0.82.0 - - - com.google.api.grpc - proto-google-cloud-securitycenter-v1 - 0.82.0 - - - com.google.api.grpc - grpc-google-cloud-securitycenter-v1 - 0.82.0 - - - com.google.cloud - google-cloud-spanner - 1.46.1-SNAPSHOT - - - com.google.api.grpc - proto-google-cloud-spanner-v1 - 1.46.1-SNAPSHOT - - - com.google.api.grpc - grpc-google-cloud-spanner-v1 - 1.46.1-SNAPSHOT - - - com.google.api.grpc - proto-google-cloud-spanner-admin-database-v1 - 1.46.1-SNAPSHOT - - - com.google.api.grpc - grpc-google-cloud-spanner-admin-database-v1 - 1.46.1-SNAPSHOT - - - com.google.api.grpc - proto-google-cloud-spanner-admin-instance-v1 - 1.46.1-SNAPSHOT - - - com.google.api.grpc - grpc-google-cloud-spanner-admin-instance-v1 - 1.46.1-SNAPSHOT - - - com.google.cloud - google-cloud-speech-bom - 1.21.0 - pom - import - - - com.google.cloud - google-cloud-storage - 1.101.1-SNAPSHOT - - - com.google.cloud - google-cloud-tasks-bom - 1.26.0 - pom - import - - - com.google.cloud - google-cloud-texttospeech-bom - 0.117.0-beta - pom - import - - - com.google.cloud - google-cloud-trace-bom - 0.109.0-beta - pom - import - - - com.google.cloud - google-cloud-translate-bom - 1.94.0 - pom - import - - - com.google.cloud - google-cloud-vision-bom - 1.98.0 - pom - import - - - com.google.cloud - google-cloud-video-intelligence - 0.115.0-beta - - - com.google.api.grpc - proto-google-cloud-video-intelligence-v1beta1 - 0.80.0 - - - com.google.api.grpc - grpc-google-cloud-video-intelligence-v1beta1 - 0.80.0 - - - com.google.api.grpc - proto-google-cloud-video-intelligence-v1beta2 - 0.80.0 - - - com.google.api.grpc - grpc-google-cloud-video-intelligence-v1beta2 - 0.80.0 - - - com.google.api.grpc - proto-google-cloud-video-intelligence-v1 - 0.80.0 - - - com.google.api.grpc - grpc-google-cloud-video-intelligence-v1 - 0.80.0 - - - com.google.api.grpc - proto-google-cloud-video-intelligence-v1p1beta1 - 0.80.0 - - - com.google.api.grpc - grpc-google-cloud-video-intelligence-v1p1beta1 - 0.80.0 - - - com.google.api.grpc - proto-google-cloud-video-intelligence-v1p2beta1 - 0.80.0 - - - com.google.api.grpc - grpc-google-cloud-video-intelligence-v1p2beta1 - 0.80.0 - - - com.google.api.grpc - proto-google-cloud-video-intelligence-v1p3beta1 - 0.80.0 - - - com.google.api.grpc - grpc-google-cloud-video-intelligence-v1p3beta1 - 0.80.0 - - - com.google.cloud - google-cloud-iot-bom - 0.116.0-beta - pom - import - - - com.google.cloud - google-cloud-websecurityscanner-bom - 0.116.0 - pom - import - - - com.google.cloud - google-cloud-iamcredentials-bom - 0.43.0-alpha - pom - import - - - com.google.cloud - google-cloud-talent-bom - 0.34.0-beta - pom - import - - - com.google.api.grpc - proto-google-cloud-webrisk-v1beta1 - 0.30.0-alpha - - - com.google.api.grpc - grpc-google-cloud-webrisk-v1beta1 - 0.30.0-alpha - - - com.google.cloud - google-cloud-webrisk - 0.30.0-alpha - - - com.google.cloud - google-cloud-phishingprotection-bom - 0.28.0 - pom - import - - - com.google.api.grpc - proto-google-cloud-recaptchaenterprise-v1beta1 - 0.27.0 - - - com.google.api.grpc - grpc-google-cloud-recaptchaenterprise-v1beta1 - 0.27.0 - - - com.google.cloud - google-cloud-recaptchaenterprise - 0.27.0 - - - io.grafeas - grafeas - 0.22.1-SNAPSHOT - - - com.google.cloud - google-cloud-gameservices-bom - 0.17.0 - pom - import - - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 - true - - sonatype-nexus-staging - https://oss.sonatype.org/ - false - - - - org.apache.maven.plugins - maven-site-plugin - 3.8.2 - - true - - - - org.jacoco - jacoco-maven-plugin - 0.8.4 - - - - prepare-agent - - - - report - test - - report - - - - - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 3.0.0 - - - - index - dependency-info - team - ci-management - issue-management - licenses - scm - dependency-management - distribution-management - summary - modules - - - - - true - true - google-cloud-bom - jar - - - - - - - - release - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - --pinentry-mode - loopback - - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.1.0 - - - attach-sources - - jar-no-fork - - - - - - - - - diff --git a/google-cloud-bom/src/site/site.xml b/google-cloud-bom/src/site/site.xml deleted file mode 100644 index 9b017fa0c74a..000000000000 --- a/google-cloud-bom/src/site/site.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - org.apache.maven.skins - maven-fluido-skin - 1.4 - - - - - - - - - diff --git a/pom.xml b/pom.xml index 05d6236b1e7b..49a1724728c4 100644 --- a/pom.xml +++ b/pom.xml @@ -83,8 +83,6 @@ google-cloud-examples google-cloud-testing google-cloud-util - - google-cloud-bom From 3e13aa08433bb324e0746129ae8e0feff541d70e Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 26 Nov 2019 12:36:46 -0800 Subject: [PATCH 2/3] stop version bumping google-cloud-bom --- google-cloud-examples/pom.xml | 2 +- google-cloud-testing/pom.xml | 2 +- versions.txt | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/google-cloud-examples/pom.xml b/google-cloud-examples/pom.xml index 6d287ec37ca6..e7b426d78be5 100644 --- a/google-cloud-examples/pom.xml +++ b/google-cloud-examples/pom.xml @@ -18,7 +18,7 @@ com.google.cloud google-cloud-bom - 0.119.1-alpha-SNAPSHOT + 0.119.1-alpha pom import diff --git a/google-cloud-testing/pom.xml b/google-cloud-testing/pom.xml index 959c4add12fb..a59366cdbf00 100644 --- a/google-cloud-testing/pom.xml +++ b/google-cloud-testing/pom.xml @@ -30,7 +30,7 @@ com.google.cloud google-cloud-bom - 0.119.1-alpha-SNAPSHOT + 0.119.1-alpha pom import diff --git a/versions.txt b/versions.txt index de85eeb97478..6b6dda8dc93b 100644 --- a/versions.txt +++ b/versions.txt @@ -10,7 +10,6 @@ google-cloud-appenginejava8:0.119.0-alpha:0.119.1-alpha-SNAPSHOT google-cloud-bigquery:1.101.0:1.101.1-SNAPSHOT google-cloud-bigquerydatatransfer:0.119.0-beta:0.119.1-beta-SNAPSHOT google-cloud-bigquerystorage:0.119.0-beta:0.119.1-beta-SNAPSHOT -google-cloud-bom:0.119.0-alpha:0.119.1-alpha-SNAPSHOT google-cloud-clients:0.119.0-alpha:0.119.1-alpha-SNAPSHOT google-cloud-compat-checker:0.119.0-alpha:0.119.1-alpha-SNAPSHOT google-cloud-contrib:0.119.0-alpha:0.119.1-alpha-SNAPSHOT From 833eb3d5209b1ae4e0650afe03ed08be5747447e Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 26 Nov 2019 12:49:56 -0800 Subject: [PATCH 3/3] fix google-cloud-bom version --- google-cloud-examples/pom.xml | 2 +- google-cloud-testing/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-examples/pom.xml b/google-cloud-examples/pom.xml index e7b426d78be5..96a50dc49617 100644 --- a/google-cloud-examples/pom.xml +++ b/google-cloud-examples/pom.xml @@ -18,7 +18,7 @@ com.google.cloud google-cloud-bom - 0.119.1-alpha + 0.119.0-alpha pom import diff --git a/google-cloud-testing/pom.xml b/google-cloud-testing/pom.xml index a59366cdbf00..85415bdcb94b 100644 --- a/google-cloud-testing/pom.xml +++ b/google-cloud-testing/pom.xml @@ -30,7 +30,7 @@ com.google.cloud google-cloud-bom - 0.119.1-alpha + 0.119.0-alpha pom import