diff --git a/RELEASING.md b/RELEASING.md
index d815f8baee21..e8cfaf85041f 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -103,37 +103,28 @@ To push a release version
assumes that there is no directory called `tmp_gh-pages` in the repository root. If it is
present, remove it before running the script.
-8. Locally edit the root `pom.xml` so that `mvn deploy` works:
- 1. Under ``, comment out `google-cloud-examples`, `google-cloud-testing`, and
- `google-cloud-util`.
- 2. Comment out the `nexus-staging-maven-plugin` plugin definition at the end of the file.
-
- **Don't commit these changes.**
-
-9. Check that you are not trying to release a SNAPSHOT build (the artifacts versions do not have
+8. 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.
**Note:** you may need to specify the stagingProfileId with `-DstagingProfileId=3187e4f20d328b`
**Note:** you may need to specify the GPG tty with `GPG_TTY=$(tty)`
-10. Uncomment the `nexus-staging-maven-plugin` plugin definition from step 8; This plugin is
- needed to release the artifacts. Run `mvn nexus-staging:release` to release the artifacts.
-
-11. Revert the local edits to your `pom.xml` performed a couple steps above by running `git checkout pom.xml`.
+9. Run `mvn nexus-staging:release` to release the artifacts. If you wish to abort the release, run
+ `mvn nexus-staging:drop`.
-12. Run `cd tmp_gh-pages && git push && cd ..` to push the previously generated docs (step 7).
+10. Run `cd tmp_gh-pages && git push && cd ..` to push the previously generated docs (step 7).
-13. Run `rm -rf tmp_gh-pages` to remove the generated docs directory from your local machine.
+11. Run `rm -rf tmp_gh-pages` to remove the generated docs directory from your local machine.
-14. Run `releasetool tag` to publish a release on Github. It will list the last few merged PRs.
+12. Run `releasetool tag` to publish a release on Github. It will list the last few merged PRs.
Select the newly merged release PR. Releasetool will create the GitHub release with notes
extracted from the pull request and tag the new release.
-15. Run `releasetool start` to bump the next snapshot version. Select "snapshot" when prompted for
+13. Run `releasetool start` to bump the next snapshot version. Select "snapshot" when prompted for
the release type. This will bump the artifact versions and create a pull request.
-16. Review and submit the PR.
+14. Review and submit the PR.
Improvements
============
diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
index 69eb9eda194b..22a3ff39659b 100644
--- a/google-api-grpc/pom.xml
+++ b/google-api-grpc/pom.xml
@@ -697,6 +697,21 @@
+
+
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+ 1.6.6
+ true
+
+ ossrh
+ https://oss.sonatype.org/
+ false
+
+
+
+
maven-compiler-plugin
@@ -710,30 +725,9 @@
true
-
- org.apache.maven.plugins
- maven-gpg-plugin
- 1.6
-
-
- sign-artifacts
- deploy
-
- sign
-
-
-
-
org.sonatype.plugins
nexus-staging-maven-plugin
- 1.6.6
- true
-
- sonatype-nexus-staging
- https://oss.sonatype.org/
- false
-
org.apache.maven.plugins
@@ -790,7 +784,6 @@
- true
protected
true
${project.build.directory}/javadoc
@@ -798,6 +791,7 @@
+
release
@@ -829,6 +823,20 @@
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+ 1.6
+
+
+ sign-artifacts
+ verify
+
+ sign
+
+
+
+
diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml
index 3bf3f97f2e1a..e3cfa46d7a78 100644
--- a/google-cloud-bom/pom.xml
+++ b/google-cloud-bom/pom.xml
@@ -1102,20 +1102,6 @@
-
- org.apache.maven.plugins
- maven-gpg-plugin
- 1.6
-
-
- sign-artifacts
- deploy
-
- sign
-
-
-
-
org.sonatype.plugins
nexus-staging-maven-plugin
@@ -1171,11 +1157,26 @@
+
release
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+ 1.6
+
+
+ sign-artifacts
+ verify
+
+ sign
+
+
+
+
org.apache.maven.plugins
maven-source-plugin
diff --git a/google-cloud-clients/google-cloud-kms/pom.xml b/google-cloud-clients/google-cloud-kms/pom.xml
index fb7a496dcf2f..5131e9472ac7 100644
--- a/google-cloud-clients/google-cloud-kms/pom.xml
+++ b/google-cloud-clients/google-cloud-kms/pom.xml
@@ -30,10 +30,6 @@
com.google.api.grpc
proto-google-cloud-kms-v1
-
- com.google.api.grpc
- proto-google-cloud-kms-v1
-
io.grpc
grpc-netty-shaded
@@ -72,11 +68,6 @@
grpc-google-cloud-kms-v1
test
-
- com.google.api.grpc
- grpc-google-cloud-kms-v1
- test
-
com.google.api.grpc
grpc-google-iam-v1
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index 64d1c50c2d3a..2e7c13fe450e 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -464,6 +464,17 @@
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+ 1.6.6
+ true
+
+ ossrh
+ https://oss.sonatype.org/
+ false
+
+
org.codehaus.mojo
cobertura-maven-plugin
@@ -594,30 +605,9 @@
true
-
- org.apache.maven.plugins
- maven-gpg-plugin
- 1.6
-
-
- sign-artifacts
- deploy
-
- sign
-
-
-
-
org.sonatype.plugins
nexus-staging-maven-plugin
- 1.6.6
- true
-
- sonatype-nexus-staging
- https://oss.sonatype.org/
- false
-
org.eluder.coveralls
@@ -778,6 +768,7 @@
+
release
@@ -814,6 +805,20 @@
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+ 1.6
+
+
+ sign-artifacts
+ verify
+
+ sign
+
+
+
+
diff --git a/google-cloud-examples/pom.xml b/google-cloud-examples/pom.xml
index 7074157922ba..8df9540681c4 100644
--- a/google-cloud-examples/pom.xml
+++ b/google-cloud-examples/pom.xml
@@ -201,14 +201,6 @@
true
-
- org.sonatype.plugins
- nexus-staging-maven-plugin
- 1.6.6
-
- true
-
-
diff --git a/google-cloud-testing/pom.xml b/google-cloud-testing/pom.xml
index 64bd2d1a91d0..33ff38428dcf 100644
--- a/google-cloud-testing/pom.xml
+++ b/google-cloud-testing/pom.xml
@@ -109,14 +109,6 @@
true
-
- org.sonatype.plugins
- nexus-staging-maven-plugin
- 1.6.6
-
- true
-
-
diff --git a/google-cloud-util/pom.xml b/google-cloud-util/pom.xml
index f798b2e47162..a03bf766aa36 100644
--- a/google-cloud-util/pom.xml
+++ b/google-cloud-util/pom.xml
@@ -31,14 +31,6 @@
true
-
- org.sonatype.plugins
- nexus-staging-maven-plugin
- 1.6.6
-
- true
-
-
diff --git a/pom.xml b/pom.xml
index ae4c0c37573d..bd7e0d51b80d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,13 +78,29 @@
google-api-grpc
- google-cloud-bom
google-cloud-clients
google-cloud-examples
google-cloud-testing
google-cloud-util
+
+ google-cloud-bom
+
+
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+ 1.6.6
+ true
+
+ ossrh
+ https://oss.sonatype.org/
+ false
+
+
+
+
org.apache.maven.plugins
@@ -102,17 +118,6 @@
true
-
- org.sonatype.plugins
- nexus-staging-maven-plugin
- 1.6.6
-
- sonatype-nexus-staging
- https://oss.sonatype.org/
- false
- true
-
-