You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by mm...@apache.org on 2017/10/02 17:18:16 UTC

calcite git commit: Minor updates to release documentation

Repository: calcite
Updated Branches:
  refs/heads/master 8430ac15a -> 980625481


Minor updates to release documentation


Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/98062548
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/98062548
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/98062548

Branch: refs/heads/master
Commit: 980625481c11b9f32a19aa0d2701c4daee53608e
Parents: 8430ac1
Author: Michael Mior <mm...@uwaterloo.ca>
Authored: Mon Oct 2 13:15:26 2017 -0400
Committer: Michael Mior <mm...@uwaterloo.ca>
Committed: Mon Oct 2 13:18:03 2017 -0400

----------------------------------------------------------------------
 site/README.md      | 2 ++
 site/_docs/howto.md | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/98062548/site/README.md
----------------------------------------------------------------------
diff --git a/site/README.md b/site/README.md
index 3b247a5..2cd5503 100644
--- a/site/README.md
+++ b/site/README.md
@@ -24,6 +24,8 @@ This directory contains the code for the Apache Calcite web site,
 
 ## Setup
 
+Note that the site can currently only be built with Ruby 2.1.x.
+
 1. `cd site`
 2. `svn co https://svn.apache.org/repos/asf/calcite/site target`
 3. `sudo apt-get install rubygems ruby2.1-dev zlib1g-dev` (linux)

http://git-wip-us.apache.org/repos/asf/calcite/blob/98062548/site/_docs/howto.md
----------------------------------------------------------------------
diff --git a/site/_docs/howto.md b/site/_docs/howto.md
index 0d5f02a..1a6b27e 100644
--- a/site/_docs/howto.md
+++ b/site/_docs/howto.md
@@ -782,12 +782,16 @@ svn ci
 The old releases will remain available in the
 [release archive](http://archive.apache.org/dist/calcite/).
 
+You should receive an email from the [Apache Reporter Service](https://reporter.apache.org/).
+Make sure to add the version number and date of the latest release at the site linked to in the email.
+
 Add a release note by copying
 [site/_posts/2016-10-12-release-1.10.0.md]({{ site.sourceRoot }}/site/_posts/2016-10-12-release-1.10.0.md),
-generate the javadoc using `mvn site` and copy to `site/target/apidocs` and `site/target/testapidocs`,
-[publish the site](#publish-the-web-site),
+generate the javadoc using `mvn site`, [publish the site](#publish-the-web-site),
 and check that it appears in the contents in [news](http://localhost:4000/news/).
 
+Merge the release branch back into `master` (e.g. `git merge --ff-only branch-X.Y`).
+
 After 24 hours, announce the release by sending an email to
 [announce@apache.org](https://mail-archives.apache.org/mod_mbox/www-announce/).
 You can use