From 94a4b5648607953030555908d301c57e79c5afca Mon Sep 17 00:00:00 2001 From: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com> Date: Mon, 21 May 2018 14:01:41 -0700 Subject: [PATCH] Post-release cleanup and fixes (specific to recent repository restructure) (#3290) 1) Fix poms deployment config. 2) Fix documentaiton links in readmes. 3) Update main README (remove `goolge-cloud` metapackage reference). 4) Update `RELEASING.md` to reflect changes. The instructions try to avoid having mysterious scripts running in the release process and also ensures that all disruptive operations (actual release/push) are done explicitly and not somewhere in the middle of a mysterious script. 5) Remove `deploy.sh` and `finalize_release.sh` scripts. 6) Fix few previously broken links (bigquerydatatransfer and compute apidocs links) --- README.md | 21 +++++++--------- RELEASING.md | 22 ++++++++-------- google-api-grpc/pom.xml | 13 ++++++++++ .../google-cloud-bigquery/README.md | 2 +- .../README.md | 2 +- .../google-cloud-bigtable/README.md | 2 +- .../google-cloud-compute/README.md | 2 +- .../google-cloud-container/README.md | 2 +- .../google-cloud-logging-logback/README.md | 2 +- .../google-cloud-dataproc/README.md | 2 +- .../google-cloud-datastore/README.md | 4 +-- .../google-cloud-dialogflow/README.md | 2 +- .../google-cloud-dlp/README.md | 2 +- .../google-cloud-dns/README.md | 2 +- .../google-cloud-errorreporting/README.md | 2 +- .../google-cloud-firestore/README.md | 2 +- .../google-cloud-iot/README.md | 2 +- .../google-cloud-language/README.md | 2 +- .../google-cloud-logging/README.md | 2 +- .../google-cloud-monitoring/README.md | 2 +- .../google-cloud-notification/README.md | 2 +- .../google-cloud-os-login/README.md | 2 +- .../google-cloud-pubsub/README.md | 2 +- .../google-cloud-redis/README.md | 2 +- .../google-cloud-spanner/README.md | 2 +- .../google-cloud-speech/README.md | 2 +- .../google-cloud-storage/README.md | 4 +-- .../google-cloud-texttospeech/README.md | 2 +- .../google-cloud-trace/README.md | 2 +- .../google-cloud-translate/README.md | 2 +- .../google-cloud-video-intelligence/README.md | 2 +- .../google-cloud-vision/README.md | 2 +- .../google-cloud-websecurityscanner/README.md | 2 +- google-cloud-examples/pom.xml | 8 ++++++ google-cloud-testing/pom.xml | 8 ++++++ .../google-cloud-compat-checker/pom.xml | 8 ++++++ google-cloud-util/pom.xml | 8 ++++++ pom.xml | 20 +++++++++++++++ utilities/deploy.sh | 25 ------------------- utilities/finalize_release.sh | 16 ------------ utilities/stage_sites.py | 2 +- 41 files changed, 118 insertions(+), 97 deletions(-) delete mode 100755 utilities/deploy.sh delete mode 100755 utilities/finalize_release.sh diff --git a/README.md b/README.md index 0a930de8e134..8792fba1fd37 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ This library supports the following Google Cloud Platform services with clients - [Cloud Video Intelligence](google-cloud-clients/google-cloud-video-intelligence) (Beta) - [Stackdriver Trace](google-cloud-clients/google-cloud-trace) (Beta) - [Text-to-Speech](google-cloud-clients/google-cloud-texttospeech) (Beta) +- [IoT](google-cloud-clients/google-cloud-iot) (Beta) This library supports the following Google Cloud Platform services with clients at an [Alpha](#versioning) quality level: @@ -43,6 +44,7 @@ This library supports the following Google Cloud Platform services with clients - [Cloud Resource Manager](google-cloud-clients/google-cloud-resourcemanager) (Alpha) - [Cloud Speech](google-cloud-clients/google-cloud-speech) (Alpha) - [Dialogflow](google-cloud-clients/google-cloud-dialogflow) (Alpha) +- [Web Security Scanner](google-cloud-clients/google-cloud-websecurityscanner) (Alpha) These libraries are deprecated and no longer receive updates: @@ -51,32 +53,27 @@ These libraries are deprecated and no longer receive updates: Quickstart ---------- -The easy way to get started is to add the umbrella package which pulls in all of the supported clients as -dependencies. Note that even though the version of the umbrella package is Alpha, the individual clients are -at different support levels (Alpha, Beta, and GA). +To call any of the supported Google Cloud Services simply add a corresponding client library artifact as a dependency to your project. The following instructions use `google-cloud-storage` as an example (specific instructions can be found in the README of each client). -[//]: # ({x-version-update-start:google-cloud:released}) +[//]: # ({x-version-update-start:google-cloud-storage:released}) If you are using Maven, add this to your pom.xml file ```xml com.google.cloud - google-cloud - 0.48.0-alpha + google-cloud-storage + 1.30.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud:0.48.0-alpha' +compile 'com.google.cloud:google-cloud-storage:1.30.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud" % "0.48.0-alpha" +libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.30.0" ``` [//]: # ({x-version-update-end}) -It also works just as well to declare a dependency only on the specific clients that you need. See the README of -each client for instructions. - If you're using IntelliJ or Eclipse, you can add client libraries to your project using these IDE plugins: * [Cloud Tools for IntelliJ](https://cloud.google.com/tools/intellij/docs/client-libraries) * [Cloud Tools for Eclipse](https://cloud.google.com/eclipse/docs/libraries) @@ -361,4 +358,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-platform]: https://cloud.google.com/ [cloud-platform-docs]: https://cloud.google.com/docs/ -[client-lib-docs]: http://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/ +[client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html diff --git a/RELEASING.md b/RELEASING.md index 84c850162c1d..044fc12ce298 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -91,27 +91,27 @@ To push a release version 7. To ensure a clean build, remove *all* Maven targets (including subdirectories not handled by `mvn clean`) by running `rm -rf target */target`. -8. Run `utilities/stage_release.sh`. -This script builds and stages the release artifact on the Maven Central Repository, updates the README.md files with the release version + commits them locally, and finally generates a new site version for the gh-pages branch under a temporary directory named `tmp_gh-pages`. If you haven't run the release process before, it's worth verifying everything; check the staged release on the Sonatype website, and verify that the local commits have the right version updates. +8. Run `python utilities/stage_sites.py`. +This script checks out `gh-pages` branch of the repository, builds the documentation site and javadocs, copies them to the branch and commits it. This script does not push the docs and it must be done manually on the later step. The script assumes that there is no directory called `tmp_gh-pages` in the repository root, remove that directory, if exists, before running the script. -If you experience failures, you may need to: -- repeat the clean step above -- remove the temporary directory created to store docs by running `rm -rf tmp_gh-pages` -- remove staged repositories from Sonatype (to prevent them from being released in subsequent steps): if a staged repository appears [here](https://oss.sonatype.org/#nexus-search;quick~com.google.cloud), remove it by running `mvn nexus-staging:drop`. +9. Check that you are not trying to release a SNAPSHOT build (the artifacts versions do not have "-SNAPSHOT" suffix) and then run `mvn clean deploy -DskipTests=true --settings ~/.m2/settings.xml -P release` command. It will build and deploy artifacts to the staging repository. -9. Run `utilities/finalize_release.sh`. -This script will release the staged artifact on the Maven Central Repository and push the README.md and gh-pages updates to github. +10. Run `mvn nexus-staging:release` to release the artifacts. -10. Publish a release on Github manually. +11. Run `cd tmp_gh-pages && git push && cd ..` to push the previously generated docs (step 8). + +12. Run `rm -rf tmp_gh-pages` to remove the generated docs directory from your local machine. + +13. Publish a release on Github manually. Go to the [releases page](https://github.com/GoogleCloudPlatform/google-cloud-java/releases) and open the appropriate release draft. Make sure the "Tag Version" is `vX.Y.Z` and the "Release Title" is `X.Y.Z`, where `X.Y.Z` is the release version as listed in the `pom.xml` files. Add the commits since the last release into the release draft. Try to group them into sections with related changes. Anything that is a breaking change needs to be marked with `*breaking change*`. Such changes are only allowed for alpha/beta modules and `@BetaApi` features. Ensure that the format is consistent with previous releases (for an example, see the [0.1.0 release](https://github.com/GoogleCloudPlatform/google-cloud-java/releases/tag/v0.1.0)). After adding any missing updates and reformatting as necessary, publish the draft. -11. Run `python utilities/bump_versions.py next_snapshot patch` to include "-SNAPSHOT" in the current project version (Alternatively, update the versions in `versions.txt` to the correct versions for the next release.). Then, run `python utilities/replace_versions.py` to update the `pom.xml` files. (If you see updates in `README.md` files at this step, you probably did something wrong.) +14. Run `python utilities/bump_versions.py next_snapshot patch` to include "-SNAPSHOT" in the current project version (Alternatively, update the versions in `versions.txt` to the correct versions for the next release.). Then, run `python utilities/replace_versions.py` to update the `pom.xml` files. (If you see updates in `README.md` files at this step, you probably did something wrong.) -13. Create and merge in another PR to reflect the updated project version. +15. Create and merge in another PR to reflect the updated project version. Improvements ============ diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml index 109f3373f8ff..5fb7eb0e0bf9 100644 --- a/google-api-grpc/pom.xml +++ b/google-api-grpc/pom.xml @@ -686,6 +686,19 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.3 + + + attach-javadocs + + jar + + + + diff --git a/google-cloud-clients/google-cloud-bigquery/README.md b/google-cloud-clients/google-cloud-bigquery/README.md index a7cdb356daa9..cd07059f3449 100644 --- a/google-cloud-clients/google-cloud-bigquery/README.md +++ b/google-cloud-clients/google-cloud-bigquery/README.md @@ -245,4 +245,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-bigquery]: https://cloud.google.com/bigquery/ [cloud-storage]: https://cloud.google.com/storage/ [bigquery-product-docs]: https://cloud.google.com/bigquery/docs/ -[bigquery-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/bigquery/package-summary.html +[bigquery-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/bigquery/package-summary.html diff --git a/google-cloud-clients/google-cloud-bigquerydatatransfer/README.md b/google-cloud-clients/google-cloud-bigquerydatatransfer/README.md index a3a407f38ab0..f94c5053a3d6 100644 --- a/google-cloud-clients/google-cloud-bigquerydatatransfer/README.md +++ b/google-cloud-clients/google-cloud-bigquerydatatransfer/README.md @@ -115,4 +115,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-bigquerydatatransfer]: https://cloud.google.com/bigquery/docs/transfer-service-overview [bigquerydatatransfer-product-docs]: https://cloud.google.com/bigquery/docs/transfer-service-overview -[bigquerydatatransfer-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/bigquerydatatransfer/v1/package-summary.html +[bigquerydatatransfer-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/bigquery/datatransfer/v1/package-summary.html diff --git a/google-cloud-clients/google-cloud-bigtable/README.md b/google-cloud-clients/google-cloud-bigtable/README.md index f39b00a2fc73..fe8d8b30d608 100644 --- a/google-cloud-clients/google-cloud-bigtable/README.md +++ b/google-cloud-clients/google-cloud-bigtable/README.md @@ -171,4 +171,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-platform]: https://cloud.google.com/ [cloud-bigtable]: https://cloud.google.com/bigtable/ [bigtable-product-docs]: https://cloud.google.com/bigtable/docs/ -[bigtable-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/bigtable/package-summary.html +[bigtable-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/bigtable/package-summary.html diff --git a/google-cloud-clients/google-cloud-compute/README.md b/google-cloud-clients/google-cloud-compute/README.md index 75ad65bd7775..52bdc19fbc89 100644 --- a/google-cloud-clients/google-cloud-compute/README.md +++ b/google-cloud-clients/google-cloud-compute/README.md @@ -276,4 +276,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-compute]: https://cloud.google.com/compute/ [compute-product-docs]: https://cloud.google.com/compute/docs/ -[compute-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/compute/package-summary.html +[compute-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/compute/deprecated/package-summary.html diff --git a/google-cloud-clients/google-cloud-container/README.md b/google-cloud-clients/google-cloud-container/README.md index 2cc80d379b2b..2eb4b8959cbc 100644 --- a/google-cloud-clients/google-cloud-container/README.md +++ b/google-cloud-clients/google-cloud-container/README.md @@ -117,4 +117,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-container]: https://cloud.google.com/kubernetes-engine/ [cloud-container-quickstart]: https://cloud.google.com/kubernetes-engine/docs/quickstart [container-product-docs]: https://cloud.google.com/kubernetes-engine/docs/ -[container-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/container/v1/package-summary.html +[container-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/container/v1/package-summary.html diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/README.md b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/README.md index d9d74a1cffbb..a486a65ab458 100644 --- a/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/README.md +++ b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/README.md @@ -7,7 +7,7 @@ Logback appender `com.google.cloud.logging.logback.LoggingAppender` for This library allows you to use [Logback](https://logback.qos.ch/) configuration and the [Slf4j](https://www.slf4j.org/) interface to log via Google Cloud logging. - [Homepage](https://googlecloudplatform.github.io/google-cloud-java/) -- [API Documentation](https://googlecloudplatform.github.io/google-cloud-java/apidocs/index.html?com/google/cloud/logging/logback/LoggingAppender.html) +- [API Documentation](https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/logging/logback/LoggingAppender.html) > Note: This client is a work-in-progress, and may occasionally > make backwards-incompatible changes. diff --git a/google-cloud-clients/google-cloud-dataproc/README.md b/google-cloud-clients/google-cloud-dataproc/README.md index ee0896697c7c..5a94cc74de2f 100644 --- a/google-cloud-clients/google-cloud-dataproc/README.md +++ b/google-cloud-clients/google-cloud-dataproc/README.md @@ -117,5 +117,5 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-dataproc]: https://cloud.google.com/dataproc/ [cloud-dataproc-quickstart]: https://cloud.google.com/dataproc/quickstart-console#before-you-begin [dataproc-product-docs]: https://cloud.google.com/dataproc/docs/ -[dataproc-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/dataproc/v1/package-summary.html +[dataproc-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/dataproc/v1/package-summary.html [auth]: https://cloud.google.com/docs/authentication/getting-started diff --git a/google-cloud-clients/google-cloud-datastore/README.md b/google-cloud-clients/google-cloud-datastore/README.md index 1fc8af4e9b5b..d087855ac7b4 100644 --- a/google-cloud-clients/google-cloud-datastore/README.md +++ b/google-cloud-clients/google-cloud-datastore/README.md @@ -36,7 +36,7 @@ libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.30.0" Example Applications -------------------- -- [`DatastoreExample`](../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java) is a simple command line interface for the Cloud Datastore. Read more about using the application on the [`DatastoreExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/?com/google/cloud/examples/datastore/DatastoreExample.html). +- [`DatastoreExample`](../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java) is a simple command line interface for the Cloud Datastore. Read more about using the application on the [`DatastoreExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/?com/google/cloud/examples/datastore/DatastoreExample.html). - [`Bookshelf`](https://github.com/GoogleCloudPlatform/getting-started-java/tree/master/bookshelf) - An App Engine app that manages a virtual bookshelf. - This app uses `google-cloud` to interface with Cloud Datastore and Cloud Storage. It also uses Cloud SQL, another Google Cloud Platform service. - [`Flexible Environment/Datastore example`](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/datastore) - A simple app that uses Cloud Datastore to list the last 10 IP addresses that visited your site. @@ -226,4 +226,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-datastore-activation]: https://cloud.google.com/datastore/docs/activate [cloud-datastore]: https://cloud.google.com/datastore/ [datastore-product-docs]: https://cloud.google.com/datastore/docs/ -[datastore-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/datastore/package-summary.html +[datastore-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/datastore/package-summary.html diff --git a/google-cloud-clients/google-cloud-dialogflow/README.md b/google-cloud-clients/google-cloud-dialogflow/README.md index c5f642d494a0..ea699cc7d84e 100644 --- a/google-cloud-clients/google-cloud-dialogflow/README.md +++ b/google-cloud-clients/google-cloud-dialogflow/README.md @@ -101,4 +101,4 @@ Apache 2.0 - See [LICENSE] for more information. [dialogflow]: https://dialogflow.com/ [dialogflow-standard-product-docs]: https://dialogflow.com/docs [dialogflow-enterprise-product-docs]: https://cloud.google.com/dialogflow-enterprise/docs/ -[dialogflow-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/dialogflow/v2beta1/package-summary.html +[dialogflow-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/dialogflow/v2beta1/package-summary.html diff --git a/google-cloud-clients/google-cloud-dlp/README.md b/google-cloud-clients/google-cloud-dlp/README.md index 37263a698809..5fcbd57301e6 100644 --- a/google-cloud-clients/google-cloud-dlp/README.md +++ b/google-cloud-clients/google-cloud-dlp/README.md @@ -103,4 +103,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-platform]: https://cloud.google.com/ [cloud-dlp]: https://cloud.google.com/dlp/ [dlp-product-docs]: https://cloud.google.com/dlp/docs/ -[dlp-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/dlp/v2beta1/package-summary.html +[dlp-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/dlp/v2/package-summary.html diff --git a/google-cloud-clients/google-cloud-dns/README.md b/google-cloud-clients/google-cloud-dns/README.md index d0967dc8b099..e950cb879887 100644 --- a/google-cloud-clients/google-cloud-dns/README.md +++ b/google-cloud-clients/google-cloud-dns/README.md @@ -394,4 +394,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-dns]: https://cloud.google.com/dns/ [cloud-dns-activate]: https://cloud.google.com/dns/getting-started#prerequisites [dns-product-docs]: https://cloud.google.com/dns/docs/ -[dns-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/dns/package-summary.html +[dns-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/dns/package-summary.html diff --git a/google-cloud-clients/google-cloud-errorreporting/README.md b/google-cloud-clients/google-cloud-errorreporting/README.md index f03b85d04023..e1a8586dab1b 100644 --- a/google-cloud-clients/google-cloud-errorreporting/README.md +++ b/google-cloud-clients/google-cloud-errorreporting/README.md @@ -102,4 +102,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-platform]: https://cloud.google.com/ [stackdriver-error-reporting]: https://cloud.google.com/error-reporting/ [error-reporting-product-docs]: https://cloud.google.com/error-reporting/docs/ -[error-reporting-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/errorreporting/v1beta1/package-summary.html +[error-reporting-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/errorreporting/v1beta1/package-summary.html diff --git a/google-cloud-clients/google-cloud-firestore/README.md b/google-cloud-clients/google-cloud-firestore/README.md index dbccad4bc8ee..d8679c8f1f48 100644 --- a/google-cloud-clients/google-cloud-firestore/README.md +++ b/google-cloud-clients/google-cloud-firestore/README.md @@ -3,7 +3,7 @@ Google Cloud Java Client for Firestore - [Product Documentation](https://cloud.google.com/firestore/docs/) -- [Client Library Documentation](https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/firestore/package-summary.html) +- [Client Library Documentation](https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/firestore/package-summary.html) Quickstart ---------- diff --git a/google-cloud-clients/google-cloud-iot/README.md b/google-cloud-clients/google-cloud-iot/README.md index a8f934369ca9..eb2fc8b008b9 100644 --- a/google-cloud-clients/google-cloud-iot/README.md +++ b/google-cloud-clients/google-cloud-iot/README.md @@ -99,4 +99,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-platform]: https://cloud.google.com/ [cloud-iot]: https://cloud.google.com/iot-core [iot-product-docs]: https://cloud.google.com/iot-core/docs -[iot-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/iot/v1/package-summary.html +[iot-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/iot/v1/package-summary.html diff --git a/google-cloud-clients/google-cloud-language/README.md b/google-cloud-clients/google-cloud-language/README.md index 447c86968a39..1632714ab117 100644 --- a/google-cloud-clients/google-cloud-language/README.md +++ b/google-cloud-clients/google-cloud-language/README.md @@ -129,4 +129,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-platform]: https://cloud.google.com/ [cloud-language]: https://cloud.google.com/natural-language/ [language-product-docs]: https://cloud.google.com/natural-language/docs/ -[language-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/language/v1beta2/package-summary.html +[language-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/language/v1beta2/package-summary.html diff --git a/google-cloud-clients/google-cloud-logging/README.md b/google-cloud-clients/google-cloud-logging/README.md index 3aaeb33f3fb8..518bd62ab07e 100644 --- a/google-cloud-clients/google-cloud-logging/README.md +++ b/google-cloud-clients/google-cloud-logging/README.md @@ -229,4 +229,4 @@ Apache 2.0 - See [LICENSE] for more information. [stackdriver-logging]: https://cloud.google.com/logging/ [stackdriver-logging-quickstart]: https://cloud.google.com/logging/docs/quickstart-sdk [logging-product-docs]: https://cloud.google.com/logging/docs/ -[logging-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/logging/package-summary.html +[logging-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/logging/package-summary.html diff --git a/google-cloud-clients/google-cloud-monitoring/README.md b/google-cloud-clients/google-cloud-monitoring/README.md index b82b6723a192..1ec637d80862 100644 --- a/google-cloud-clients/google-cloud-monitoring/README.md +++ b/google-cloud-clients/google-cloud-monitoring/README.md @@ -99,4 +99,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-platform]: https://cloud.google.com/ [stackdriver-monitoring]: https://cloud.google.com/monitoring/ [monitoring-product-docs]: https://cloud.google.com/monitoring/docs/ -[monitoring-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/monitoring/v3/package-summary.html +[monitoring-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/monitoring/v3/package-summary.html diff --git a/google-cloud-clients/google-cloud-notification/README.md b/google-cloud-clients/google-cloud-notification/README.md index d84c605fa585..d2cdb43a0a44 100644 --- a/google-cloud-clients/google-cloud-notification/README.md +++ b/google-cloud-clients/google-cloud-notification/README.md @@ -3,7 +3,7 @@ Google Cloud Java Client for Cloud Pub/Sub Notifications - [Product Documentation](https://cloud.google.com/storage/docs/pubsub-notifications) -- [Client Library Documentation](https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/notification/package-summary.html) +- [Client Library Documentation](https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/notification/package-summary.html) Quickstart ---------- diff --git a/google-cloud-clients/google-cloud-os-login/README.md b/google-cloud-clients/google-cloud-os-login/README.md index 4bda056bdac2..550cea3e661c 100644 --- a/google-cloud-clients/google-cloud-os-login/README.md +++ b/google-cloud-clients/google-cloud-os-login/README.md @@ -108,5 +108,5 @@ Apache 2.0 - See [LICENSE] for more information. [TESTING]: https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/TESTING.md [cloud-os-login]: https://cloud.google.com/compute/docs/oslogin/rest/ -[os-login-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/oslogin/v1/package-summary.html +[os-login-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/oslogin/v1/package-summary.html [auth]: https://cloud.google.com/docs/authentication/getting-started diff --git a/google-cloud-clients/google-cloud-pubsub/README.md b/google-cloud-clients/google-cloud-pubsub/README.md index 3bcba6446be5..7c52f35873b5 100644 --- a/google-cloud-clients/google-cloud-pubsub/README.md +++ b/google-cloud-clients/google-cloud-pubsub/README.md @@ -246,4 +246,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-pubsub]: https://cloud.google.com/pubsub/ [cloud-pubsub-quickstart]: https://cloud.google.com/pubsub/quickstart-console#before-you-begin [pubsub-product-docs]: https://cloud.google.com/pubsub/docs/ -[pubsub-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/pubsub/v1/package-summary.html +[pubsub-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/pubsub/v1/package-summary.html diff --git a/google-cloud-clients/google-cloud-redis/README.md b/google-cloud-clients/google-cloud-redis/README.md index 0cbddd55343c..9b92a24f97ac 100644 --- a/google-cloud-clients/google-cloud-redis/README.md +++ b/google-cloud-clients/google-cloud-redis/README.md @@ -114,4 +114,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-redis]: https://cloud.google.com/memorystore/ [redis-product-docs]: https://cloud.google.com/memorystore/docs/redis/ -[redis-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/redis/v1/package-summary.html +[redis-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/redis/v1/package-summary.html diff --git a/google-cloud-clients/google-cloud-spanner/README.md b/google-cloud-clients/google-cloud-spanner/README.md index 96f890a43b0a..bcc7d8f65eb9 100644 --- a/google-cloud-clients/google-cloud-spanner/README.md +++ b/google-cloud-clients/google-cloud-spanner/README.md @@ -145,4 +145,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-platform]: https://cloud.google.com/ [cloud-spanner]: https://cloud.google.com/spanner/ [spanner-product-docs]: https://cloud.google.com/spanner/docs/ -[spanner-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/spanner/package-summary.html +[spanner-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/spanner/package-summary.html diff --git a/google-cloud-clients/google-cloud-speech/README.md b/google-cloud-clients/google-cloud-speech/README.md index c28d69ce85ae..474e9f51e344 100644 --- a/google-cloud-clients/google-cloud-speech/README.md +++ b/google-cloud-clients/google-cloud-speech/README.md @@ -136,4 +136,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-platform]: https://cloud.google.com/ [cloud-speech]: https://cloud.google.com/speech/ [speech-product-docs]: https://cloud.google.com/speech/docs -[speech-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/speech/v1beta1/package-summary.html +[speech-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/speech/v1beta1/package-summary.html diff --git a/google-cloud-clients/google-cloud-storage/README.md b/google-cloud-clients/google-cloud-storage/README.md index 42a0c161b212..17e424866991 100644 --- a/google-cloud-clients/google-cloud-storage/README.md +++ b/google-cloud-clients/google-cloud-storage/README.md @@ -37,7 +37,7 @@ libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.30.0" Example Applications ------------------- -- [`StorageExample`](../google-cloud-examples/src/main/java/com/google/cloud/examples/storage/StorageExample.java) is a simple command line interface that provides some of Cloud Storage's functionality. Read more about using the application on the [`StorageExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/?com/google/cloud/examples/storage/StorageExample.html). +- [`StorageExample`](../google-cloud-examples/src/main/java/com/google/cloud/examples/storage/StorageExample.java) is a simple command line interface that provides some of Cloud Storage's functionality. Read more about using the application on the [`StorageExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/?com/google/cloud/examples/storage/StorageExample.html). - [`Bookshelf`](https://github.com/GoogleCloudPlatform/getting-started-java/tree/master/bookshelf) - An App Engine app that manages a virtual bookshelf. - This app uses `google-cloud` to interface with Cloud Datastore and Cloud Storage. It also uses Cloud SQL, another Google Cloud Platform service. - [`Flexible Environment/Storage example`](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/cloudstorage) - An app that uploads files to a public Cloud Storage bucket on the App Engine Flexible Environment runtime. @@ -223,4 +223,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-storage-create-bucket]: https://cloud.google.com/storage/docs/cloud-console#_creatingbuckets [cloud-storage-activation]:https://cloud.google.com/storage/docs/signup?hl=en [storage-product-docs]: https://cloud.google.com/storage/docs/ -[storage-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/storage/package-summary.html +[storage-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/storage/package-summary.html diff --git a/google-cloud-clients/google-cloud-texttospeech/README.md b/google-cloud-clients/google-cloud-texttospeech/README.md index a536652a000c..feef52da2fcd 100644 --- a/google-cloud-clients/google-cloud-texttospeech/README.md +++ b/google-cloud-clients/google-cloud-texttospeech/README.md @@ -99,4 +99,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-platform]: https://cloud.google.com/ [cloud-texttospeech]: https://cloud.google.com/texttospeech [texttospeech-product-docs]: https://cloud.google.com/texttospeech/docs -[texttospeech-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/texttospeech/v1beta1/package-summary.html +[texttospeech-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/texttospeech/v1beta1/package-summary.html diff --git a/google-cloud-clients/google-cloud-trace/README.md b/google-cloud-clients/google-cloud-trace/README.md index 4be7497b5682..9087665ca5bf 100644 --- a/google-cloud-clients/google-cloud-trace/README.md +++ b/google-cloud-clients/google-cloud-trace/README.md @@ -99,4 +99,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-platform]: https://cloud.google.com/ [stackdriver-trace]: https://cloud.google.com/trace/ [trace-product-docs]: https://cloud.google.com/trace/docs/ -[trace-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/trace/v1/package-summary.html +[trace-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/trace/v1/package-summary.html diff --git a/google-cloud-clients/google-cloud-translate/README.md b/google-cloud-clients/google-cloud-translate/README.md index 81960b2b12f5..1136c1684984 100644 --- a/google-cloud-clients/google-cloud-translate/README.md +++ b/google-cloud-clients/google-cloud-translate/README.md @@ -204,4 +204,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-translate]: https://cloud.google.com/translate/ [cloud-translate-quickstart]: https://cloud.google.com/translate/v2/quickstart [translate-product-docs]: https://cloud.google.com/translate/docs/ -[translate-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/translate/package-summary.html +[translate-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/translate/package-summary.html diff --git a/google-cloud-clients/google-cloud-video-intelligence/README.md b/google-cloud-clients/google-cloud-video-intelligence/README.md index 01f2bccebc74..f5d503c41c6f 100644 --- a/google-cloud-clients/google-cloud-video-intelligence/README.md +++ b/google-cloud-clients/google-cloud-video-intelligence/README.md @@ -103,4 +103,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-platform]: https://cloud.google.com/ [cloud-video-intelligence]: https://cloud.google.com/video-intelligence/ [video-product-docs]: https://cloud.google.com/video-intelligence/docs/ -[video-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/videointelligence/v1/package-summary.html +[video-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/videointelligence/v1/package-summary.html diff --git a/google-cloud-clients/google-cloud-vision/README.md b/google-cloud-clients/google-cloud-vision/README.md index 0b6280b87f2e..ed12897c7261 100644 --- a/google-cloud-clients/google-cloud-vision/README.md +++ b/google-cloud-clients/google-cloud-vision/README.md @@ -102,4 +102,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-platform]: https://cloud.google.com/ [cloud-vision]: https://cloud.google.com/vision/ [vision-product-docs]: https://cloud.google.com/vision/docs -[vision-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/vision/v1/package-summary.html +[vision-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/vision/v1/package-summary.html diff --git a/google-cloud-clients/google-cloud-websecurityscanner/README.md b/google-cloud-clients/google-cloud-websecurityscanner/README.md index 9779678a22d6..59a8b2bb675f 100644 --- a/google-cloud-clients/google-cloud-websecurityscanner/README.md +++ b/google-cloud-clients/google-cloud-websecurityscanner/README.md @@ -99,4 +99,4 @@ Apache 2.0 - See [LICENSE] for more information. [cloud-platform]: https://cloud.google.com/ [cloud-websecurityscanner]: https://cloud.google.com/security-scanner [websecurityscanner-product-docs]: https://cloud.google.com/security-scanner/docs -[websecurityscanner-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/websecurityscanner/v1alpha/package-summary.html +[websecurityscanner-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/websecurityscanner/v1alpha/package-summary.html diff --git a/google-cloud-examples/pom.xml b/google-cloud-examples/pom.xml index 6680368f7d65..c72fe9b368fe 100644 --- a/google-cloud-examples/pom.xml +++ b/google-cloud-examples/pom.xml @@ -188,6 +188,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 2.7 + + true + + diff --git a/google-cloud-testing/pom.xml b/google-cloud-testing/pom.xml index 00b757dadcf4..d6cdf6595e71 100644 --- a/google-cloud-testing/pom.xml +++ b/google-cloud-testing/pom.xml @@ -101,6 +101,14 @@ true + + org.apache.maven.plugins + maven-deploy-plugin + 2.7 + + true + + diff --git a/google-cloud-util/google-cloud-compat-checker/pom.xml b/google-cloud-util/google-cloud-compat-checker/pom.xml index cb9918696f85..f964bbcb1b57 100644 --- a/google-cloud-util/google-cloud-compat-checker/pom.xml +++ b/google-cloud-util/google-cloud-compat-checker/pom.xml @@ -103,6 +103,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 2.7 + + true + + diff --git a/google-cloud-util/pom.xml b/google-cloud-util/pom.xml index 76322bdc2e73..587c74267bbc 100644 --- a/google-cloud-util/pom.xml +++ b/google-cloud-util/pom.xml @@ -23,6 +23,14 @@ true + + org.apache.maven.plugins + maven-deploy-plugin + 2.7 + + true + + diff --git a/pom.xml b/pom.xml index d743fdb89e22..58e809ea7b55 100644 --- a/pom.xml +++ b/pom.xml @@ -84,4 +84,24 @@ google-cloud-testing google-cloud-util + + + + org.apache.maven.plugins + maven-site-plugin + 3.4 + + true + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.7 + + true + + + + diff --git a/utilities/deploy.sh b/utilities/deploy.sh deleted file mode 100755 index a84eb0724cd2..000000000000 --- a/utilities/deploy.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -e - -SITE_VERSION=$1 - -if [ -z $SITE_VERSION ]; then - echo "First arg (version) not provided, so we're exiting." - exit 1 -fi - -if [ "${SITE_VERSION##*-}" == "SNAPSHOT" ]; then - echo "Deploying Snapshot artifacts..." - mvn clean deploy --quiet -Djava.util.logging.config.file=logging.properties -DskipTests=true -Dgpg.skip=true --settings ~/.m2/settings.xml -P release -else - # Deploy Maven artifacts (if they don't exist yet) and update artifact version in READMEs. - URL=https://oss.sonatype.org/content/repositories/releases/com/google/cloud/google-cloud/$SITE_VERSION/ - if curl --output /dev/null --silent --head --fail "$URL"; then - echo "Not deploying artifacts because it seems like they already exist." - echo "Existence was checked using the url $URL" - else - echo "Deploying Release artifacts..." - mvn clean deploy --quiet -Djava.util.logging.config.file=logging.properties -DskipTests=true --settings ~/.m2/settings.xml -P release - fi -fi diff --git a/utilities/finalize_release.sh b/utilities/finalize_release.sh deleted file mode 100755 index 73cda695bfde..000000000000 --- a/utilities/finalize_release.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -set -e - -mvn nexus-staging:release - -# Push the version and README updates -git push - -# Push the gh-pages updates -pushd tmp_gh-pages -git push -popd - -# Remove gh-pages temporary directory -rm -rf tmp_gh-pages diff --git a/utilities/stage_sites.py b/utilities/stage_sites.py index ef5852926225..6bf7d9df9b6a 100644 --- a/utilities/stage_sites.py +++ b/utilities/stage_sites.py @@ -52,5 +52,5 @@ def _run(command, cwd=None): if __name__ == '__main__': stage_sites(['google-api-grpc', 'google-cloud-clients'], 'tmp_gh-pages', - 'https://github.com/GoogleCloudPlatform/google-cloud-java', + 'git@github.com:GoogleCloudPlatform/google-cloud-java.git', 'https://googlecloudplatform.github.io/google-cloud-java')