From 9ba2b426b125b33d37ed8f11d5f636382d077208 Mon Sep 17 00:00:00 2001 From: jon-wei Date: Fri, 3 Jan 2020 13:11:33 -0800 Subject: [PATCH 1/3] Graduation update for ASF release process guide and download links --- .backportrc.json | 4 +- distribution/asf-release-process-guide.md | 339 +++++---------------- distribution/bin/find-missing-backports.py | 2 +- distribution/bin/get-milestone-prs.py | 2 +- docs/tutorials/cluster.md | 2 +- docs/tutorials/index.md | 2 +- pom.xml | 3 +- website/script/fix-path.js | 2 +- 8 files changed, 91 insertions(+), 265 deletions(-) diff --git a/.backportrc.json b/.backportrc.json index 458d5fe08cf6..ab91e4c67b5b 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -1,7 +1,7 @@ { "upstream": "apache/druid", "branches": [ - { "name": "0.16.0-incubating", "checked": true }, - { "name": "0.17.0-incubating", "checked": true } + { "name": "0.16.1-incubating", "checked": true }, + { "name": "0.17.0", "checked": true } ] } diff --git a/distribution/asf-release-process-guide.md b/distribution/asf-release-process-guide.md index 20ce680085d8..c166f1d9103e 100644 --- a/distribution/asf-release-process-guide.md +++ b/distribution/asf-release-process-guide.md @@ -28,21 +28,21 @@ First up in performing an official release of Apache Druid is to announce in the Next up is creating the release branch off of master (or the previous release branch for a bug fix release). Be sure to do this from the apache git repo, _not your fork_. Name the branch for the release version that is being created, omitting the `druid` prefix that will appear on the release candidate and release tags: ```bash -$ git checkout origin/0.15.0-incubating +$ git checkout origin/0.17.0 ... -$ git checkout -b 0.15.1-incubating +$ git checkout -b 0.17.1 ``` ```bash $ git checkout origin/master ... -$ git checkout -b 0.16.0-incubating +$ git checkout -b 0.17.0 ``` Then push the branch to `origin`. If doing a quarterly release, it will also be necessary to bump the version in master to the next release snapshot: ```bash -$ mvn versions:set -DnewVersion=0.17.0-incubating-SNAPSHOT +$ mvn versions:set -DnewVersion=0.18.0-SNAPSHOT ``` and open a PR to the master branch. Bug fix releases should already have the correct snapshot version from the previous releases on the branch, so this step is not necessary. @@ -82,10 +82,10 @@ sub rsa4096 2019-02-28 [E] If all goes well, your Apache account will be associated with that key, which you can check at https://people.apache.org/committer-index.html -You will also need to add your key to our project KEYS file: https://dist.apache.org/repos/dist/release/incubator/druid/KEYS, this repo can be pulled with: +You will also need to add your key to our project KEYS file: https://dist.apache.org/repos/dist/release/druid/KEYS, this repo can be pulled with: ```bash -$ svn co https://dist.apache.org/repos/dist/release/incubator/druid +$ svn co https://dist.apache.org/repos/dist/release/druid ``` Add your entry to the file and commit: @@ -128,7 +128,7 @@ http://www.apache.org/legal/src-headers.html http://www.apache.org/legal/resolved.html -There are in effect 2 versions of the `LICENSE` and `NOTICE` file needed to perform a release, one set for the official ASF source release which are the actual `LICENSE` and `NOTICE` file in the root directory, and second for the convenience binary release which includes all of Druid's dependencies which we synthesize using some tools we have developed over the initial set of 'incubating' releases. +There are in effect 2 versions of the `LICENSE` and `NOTICE` file needed to perform a release, one set for the official ASF source release which are the actual `LICENSE` and `NOTICE` file in the root directory, and second for the convenience binary release which includes all of Druid's dependencies which we synthesize using some tools we have developed over the initial set of releases. ### licenses.yaml @@ -181,7 +181,7 @@ It is also the release managers responsibility for correctly assigning all PRs m | [find-missing-backports](bin/find-missing-backports.py) | Find PRs which have been back-ported to one release branch but not another. Useful if a bug fix release based on the previous release is required during a release cycle. | -Next create an issue in the Druid github to contain the release notes and allow the community to provide feedback prior to the release. Make sure to attach it to the release milestone in github. It is highly recommended to review [previous release notes for reference](https://github.com/apache/druid/issues?utf8=%E2%9C%93&q=is%3Aissue+%22incubating+release+notes%22+label%3A%22Release+Notes%22+is%3Aclosed+) of how to best structure them. Be sure to call out any exciting new features, important bug fixes, and any compatibility concerns for users or operators to consider when upgrading to this release. +Next create an issue in the Druid github to contain the release notes and allow the community to provide feedback prior to the release. Make sure to attach it to the release milestone in github. It is highly recommended to review [previous release notes for reference](https://github.com/apache/druid/releases) of how to best structure them. Be sure to call out any exciting new features, important bug fixes, and any compatibility concerns for users or operators to consider when upgrading to this release. ## Building a release candidate @@ -191,10 +191,10 @@ Next create an issue in the Druid github to contain the release notes and allow Once the release branch is good for an RC, you can build a new tag with: ```bash -$ mvn -DreleaseVersion=0.16.0-incubating -DdevelopmentVersion=0.16.1-incubating-SNAPSHOT -Dtag=druid-0.16.0-incubating-rc3 -DpushChanges=false clean release:clean release:prepare +$ mvn -DreleaseVersion=0.17.0 -DdevelopmentVersion=0.18.0-SNAPSHOT -Dtag=druid-0.17.0-rc3 -DpushChanges=false clean release:clean release:prepare ``` -In this example it will create a tag, `druid-0.16.0-incubating-rc3`. If this release passes vote then we can add the final `druid-0.16.0-incubating` release tag later. +In this example it will create a tag, `druid-0.17.0-rc3`. If this release passes vote then we can add the final `druid-0.17.0` release tag later. **Retain the release.properties file! You will need it when uploading the Maven artifacts for the final release.** @@ -207,7 +207,7 @@ $ git clone git@github.com:apache/druid.git druid-release ### Switch to tag ```bash -$ git checkout druid-0.16.0-incubating-rc3 +$ git checkout druid-0.17.0-rc3 ``` ### Build Artifacts @@ -219,30 +219,30 @@ $ mvn clean install -Papache-release,dist,rat -DskipTests -Dgpg.keyname= \n') - sys.stderr.write(" e.g., program myusername 0.14.0-incubating 0.15.0-incubating 30") + sys.stderr.write(" e.g., program myusername 0.17.0 0.18.0 30") sys.stderr.write(" It is also necessary to set a GIT_TOKEN environment variable containing a personal access token.") sys.exit(1) diff --git a/distribution/bin/get-milestone-prs.py b/distribution/bin/get-milestone-prs.py index f78a70e37c77..28e05968082b 100755 --- a/distribution/bin/get-milestone-prs.py +++ b/distribution/bin/get-milestone-prs.py @@ -24,7 +24,7 @@ if len(sys.argv) != 5: sys.stderr.write('usage: program \n') - sys.stderr.write(" e.g., program myusername upstream 0.13.0-incubating 0.14.0-incubating") + sys.stderr.write(" e.g., program myusername upstream 0.17.0 0.18.0") sys.stderr.write(" It is also necessary to set a GIT_TOKEN environment variable containing a personal access token.") sys.exit(1) diff --git a/docs/tutorials/cluster.md b/docs/tutorials/cluster.md index 74856562286b..17a8195c3757 100644 --- a/docs/tutorials/cluster.md +++ b/docs/tutorials/cluster.md @@ -148,7 +148,7 @@ First, download and unpack the release archive. It's best to do this on a single since you will be editing the configurations and then copying the modified distribution out to all of your servers. -[Download](https://www.apache.org/dyn/closer.cgi?path=/incubator/druid/{{DRUIDVERSION}}/apache-druid-{{DRUIDVERSION}}-bin.tar.gz) +[Download](https://www.apache.org/dyn/closer.cgi?path=/druid/{{DRUIDVERSION}}/apache-druid-{{DRUIDVERSION}}-bin.tar.gz) the {{DRUIDVERSION}} release. Extract Druid by running the following commands in your terminal: diff --git a/docs/tutorials/index.md b/docs/tutorials/index.md index 928262b61f99..bd2086f25a0f 100644 --- a/docs/tutorials/index.md +++ b/docs/tutorials/index.md @@ -55,7 +55,7 @@ configuration than `micro-quickstart`. ## Getting started -[Download](https://www.apache.org/dyn/closer.cgi?path=/incubator/druid/{{DRUIDVERSION}}/apache-druid-{{DRUIDVERSION}}-bin.tar.gz) +[Download](https://www.apache.org/dyn/closer.cgi?path=/druid/{{DRUIDVERSION}}/apache-druid-{{DRUIDVERSION}}-bin.tar.gz) the {{DRUIDVERSION}} release. Extract Druid by running the following commands in your terminal: diff --git a/pom.xml b/pom.xml index 49efe01be832..b6d5ca9314af 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ scm:git:ssh://git@github.com/apache/druid.git scm:git:ssh://git@github.com/apache/druid.git https://github.com/apache/druid.git - 0.13.0-incubating-SNAPSHOT + 0.18.0-incubating-SNAPSHOT @@ -1490,7 +1490,6 @@ org.apache.apache.resources:apache-jar-resource-bundle:1.5-SNAPSHOT - org.apache.apache.resources:apache-incubator-disclaimer-resource-bundle:1.2-SNAPSHOT diff --git a/website/script/fix-path.js b/website/script/fix-path.js index 2f27cba2a684..f6b8c2622235 100644 --- a/website/script/fix-path.js +++ b/website/script/fix-path.js @@ -19,7 +19,7 @@ const replace = require('replace-in-file'); if (process.argv.length !== 4) { - console.log('Usage: node fix-path.js latest 0.16.0-incubating'); + console.log('Usage: node fix-path.js latest 0.17.0'); process.exit(1); } From d502ac85ce91203c26659d11532cc1303ea91faa Mon Sep 17 00:00:00 2001 From: jon-wei Date: Fri, 3 Jan 2020 20:54:25 -0800 Subject: [PATCH 2/3] Fix release vote thread typo --- distribution/asf-release-process-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/asf-release-process-guide.md b/distribution/asf-release-process-guide.md index c166f1d9103e..6431eb74313e 100644 --- a/distribution/asf-release-process-guide.md +++ b/distribution/asf-release-process-guide.md @@ -291,7 +291,7 @@ To make the staged repo publicly accessible, "Close" the staging repo. ## Release candidates and voting -Release votes on held on the dev mailing list, dev@druid.apache.org. Druid PMC votes are binding. +Release votes are held on the dev mailing list, dev@druid.apache.org. Druid PMC votes are binding. You can use the following template for the release vote thread, replacing values as necessary. From e5c6c95c0bf2a028b568067edf090d642a1f1101 Mon Sep 17 00:00:00 2001 From: jon-wei Date: Mon, 6 Jan 2020 10:57:09 -0800 Subject: [PATCH 3/3] Fix pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b6d5ca9314af..8126c98ebce5 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ scm:git:ssh://git@github.com/apache/druid.git scm:git:ssh://git@github.com/apache/druid.git https://github.com/apache/druid.git - 0.18.0-incubating-SNAPSHOT + 0.18.0-SNAPSHOT