summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Miller <marco.miller@ericsson.com>2020-10-29 11:43:27 -0400
committerMarco Miller <marco.miller@ericsson.com>2020-10-29 11:43:27 -0400
commite2d1b311dc539c698b0bbd20f98002018219cedd (patch)
tree9a413a6ebbafa7e54e03ca7f70bb7e7a02d04db9
parent5aac2332362c661123640151520b63fe84c057e6 (diff)
parent1012bf09069f6a02546e9c15aa676a408e86d536 (diff)
Merge branch 'stable-3.1' into stable-3.2
* stable-3.1: Update git submodules Update git submodules Update git submodules Update git submodules Bump Bazel version to 3.7.0 Documentation: Update dev-release's rc information Update git submodules Fix tests for stable-2.16 branch Remove generation for c.g.gwtexpui.* JavaDoc Fetch JGit JavaDoc from archive.eclipse.org Update git submodules Change-Id: Ic0d9bc8b18b58e441d14c30b92ad9ae1ce8f1db4
-rw-r--r--.bazelversion2
-rw-r--r--Documentation/dev-release.txt11
2 files changed, 9 insertions, 4 deletions
diff --git a/.bazelversion b/.bazelversion
index d5c0c99142..7c69a55dbb 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-3.5.1
+3.7.0
diff --git a/Documentation/dev-release.txt b/Documentation/dev-release.txt
index e60efa0756..a7240e27ae 100644
--- a/Documentation/dev-release.txt
+++ b/Documentation/dev-release.txt
@@ -27,14 +27,19 @@ need to undergo some stabilization before releasing the final release.
* Propose the release with any plans/objectives to the mailing list.
+* Release plans usually become a
+ link:https://www.gerritcodereview.com/news.html[news article]
+ to be followed up with.
+
* Create a Gerrit `rc0`.
-* If needed create a Gerrit `rc1`.
+* If needed create Gerrit `rc1`, `rc2` and `rc3` (one per week, on Mondays
+ or so; see link:https://www.gerritcodereview.com/news.html[past release plans]).
[NOTE]
-You may let in a few features to this release.
+You may let in a few features to these releases.
-* If needed create a Gerrit `rc2`.
+* If needed create a Gerrit `rc4`.
[NOTE]
There should be no new features in this release, only bug fixes.