Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Documentation: Fix mention of legacy Google Code in dev-release
  Documentation: Fix duplicate section link in dev-release
  Set version to 3.0.14-SNAPSHOT
  Update git submodules
  Set version to 3.0.13
  Add gerrit-*_pom.xml.asc files from deployment to .gitignore
  Documentation: Link to current Maven Central in dev-release
  Documentation: Make punctuation consistent in dev-release
  Documentation: Mention adding changes to the release notes beside issues
  Documentation: Clarify the need to split release notes update changes
  Update git submodules

Change-Id: I9c0f00842f8763e7a9aeaf81c6d9ce35de45b80b
This commit is contained in:
Marco Miller 2020-10-01 18:33:32 -04:00
commit 711d9edb0d
2 changed files with 35 additions and 23 deletions

1
.gitignore vendored
View File

@ -47,5 +47,6 @@
!/plugins/webhooks
/test_site
/tools/format
/tools/maven/gerrit-*_pom.xml.asc
/tools/node_tools
/tools/polygerrit-updater

View File

@ -25,31 +25,31 @@ type of release you want to make (`stable-fix`, `stable`, `rc0`,
A `stable` release is generally built from the `master` branch and may
need to undergo some stabilization before releasing the final release.
* Propose the release with any plans/objectives to the mailing list
* Propose the release with any plans/objectives to the mailing list.
* Create a Gerrit `rc0`
* Create a Gerrit `rc0`.
* If needed create a Gerrit `rc1`
* If needed create a Gerrit `rc1`.
[NOTE]
You may let in a few features to this release
You may let in a few features to this release.
* If needed create a Gerrit `rc2`
* If needed create a Gerrit `rc2`.
[NOTE]
There should be no new features in this release, only bug fixes
There should be no new features in this release, only bug fixes.
* Finally create the `stable` release (no `rc`)
* Finally create the `stable` release (no `rc`).
=== Stable-Fix
`stable-fix` releases should likely only contain bug fixes and doc
updates.
* Propose the release with any plans/objectives to the mailing list
* Propose the release with any plans/objectives to the mailing list.
* This type of release does not need any RCs, release when the
objectives are met
objectives are met.
[[security]]
=== Security-Fix
@ -103,6 +103,14 @@ following the examples from the previous version notes. Add updated issue
owners as reviewers of the uploaded change. More reviewers can be added
or cc'ed, to further coordinate the final release contents.
Similarly to issues, also mention every noteworthy change done after the
previous release. Again, previous notes should be used as template examples.
You may need to split note update changes from the final change that
updates the links. This allows non-final update changes to be reviewed and
submitted timely. The final (links) change may take more time to complete,
as this underlying release process unfolds.
== Create the Actual Release
[[update-versions]]
@ -159,7 +167,8 @@ Tag the plugins:
----
java -jar bazel-bin/release.war --version
----
* Try upgrading a test site and launching the daemon
* Try upgrading a test site and launching the daemon.
* Verify the plugin versions:
+
@ -175,7 +184,7 @@ Tag the plugins:
* Make sure you have done the
link:dev-release-deploy-config.html#deploy-configuration-setting-maven-central[
configuration] for deploying to Maven Central
configuration] for deploying to Maven Central.
* Make sure that the version is updated in the `version.bzl` file and in
the `*_pom.xml` files as described in the link:#update-versions[Update
@ -229,7 +238,7 @@ modified anymore, but you may still drop it if you find any issues.
** Test closed staging repository
+
Once a repository is closed you can find the URL to it in the `Summary`
section, e.g. https://oss.sonatype.org/content/repositories/comgooglegerrit-1029[role=external,window=_blank]
section, e.g. https://oss.sonatype.org/content/repositories/comgooglegerrit-1029[role=external,window=_blank].
+
Use this URL for further testing of the artifacts in this repository,
e.g. to try building a plugin against the plugin API in this repository
@ -258,12 +267,12 @@ link:https://oss.sonatype.org/[Sonatype Nexus Server,role=external,window=_blank
select it and click on `Release`.
** The released artifacts are available in
https://oss.sonatype.org/content/repositories/releases/com/google/gerrit/[role=external,window=_blank]
https://oss.sonatype.org/content/repositories/releases/com/google/gerrit/[role=external,window=_blank].
** It may take up to 2 hours until the artifacts appear on Maven
Central:
+
http://central.maven.org/maven2/com/google/gerrit/[role=external,window=_blank]
https://repo1.maven.org/maven2/com/google/gerrit/[role=external,window=_blank]
* [optional]: View download statistics
@ -278,10 +287,12 @@ link:https://oss.sonatype.org/[Sonatype Nexus Server,role=external,window=_blank
[[publish-to-google-storage]]
==== Publish the Gerrit WAR to the Google Cloud Storage
* go to the link:https://console.cloud.google.com/storage/browser/gerrit-releases/?project=api-project-164060093628[
gerrit-releases bucket in the Google cloud storage console,role=external,window=_blank]
* make sure you are signed in with your Gmail account
* manually upload the Gerrit WAR file by using the `Upload` button
* Go to the link:https://console.cloud.google.com/storage/browser/gerrit-releases/?project=api-project-164060093628[
gerrit-releases bucket in the Google cloud storage console,role=external,window=_blank].
* Make sure you are signed in with your Gmail account.
* Manually upload the Gerrit WAR file by using the `Upload` button.
[[push-stable]]
==== Push the Stable Branch
@ -325,12 +336,12 @@ gerrit-documentation,role=external,window=_blank] storage bucket.
[[finalize-release-notes]]
=== Finalize the Release Notes
Submit that previously uploaded change on the homepage project.
Submit any previously uploaded notes change on the homepage project.
[[update-issues]]
[[finalize-issues]]
==== Update the Issues
After the release is actually made, you can search in Google Code for
After the release is actually made, you can search (in Monorail) for
`Status=Submitted FixedIn=$version` and then batch update these changes
to say `Status=Released`. Make sure the pulldown says `All Issues`
because `Status=Submitted` is considered a closed issue.
@ -347,7 +358,7 @@ For details refer to the documentation in the script's header, and/or the
help text:
----
~/gerrit-release-tools/release-announcement.py --help
~/gerrit-release-tools/release-announcement.py --help
----
[[increase-version]]
@ -360,7 +371,7 @@ for the next release.
Use the `version` tool to set the version in the `version.bzl` file:
----
./tools/version.py 2.6-SNAPSHOT
./tools/version.py 2.6-SNAPSHOT
----
Verify that the changes made by the tool are sane, then commit them, push