You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by le...@apache.org on 2021/01/06 01:40:29 UTC
svn commit: r45193 - in /dev/datasketches: VoteTemplates/ scripts/
Author: leerho
Date: Wed Jan 6 01:40:29 2021
New Revision: 45193
Log:
update scripts and templates for TLP
Added:
dev/datasketches/VoteTemplates/java-x.y.z-RC_VoteLetter_PMC_template.txt
Modified:
dev/datasketches/scripts/APACHE_CPP_RELEASE_STEPS.md
dev/datasketches/scripts/APACHE_JAVA_RELEASE_STEPS.md
dev/datasketches/scripts/bashDeployToDist.sh
dev/datasketches/scripts/createDownloadsInclude.sh
dev/datasketches/scripts/createZip.sh
dev/datasketches/scripts/moveDevToRelease.sh
Added: dev/datasketches/VoteTemplates/java-x.y.z-RC_VoteLetter_PMC_template.txt
==============================================================================
--- dev/datasketches/VoteTemplates/java-x.y.z-RC_VoteLetter_PMC_template.txt (added)
+++ dev/datasketches/VoteTemplates/java-x.y.z-RC_VoteLetter_PMC_template.txt Wed Jan 6 01:40:29 2021
@@ -0,0 +1,46 @@
+TO: dev@datasketches.apache.org
+
+SUBJECT: [VOTE] Release Apache DataSketches-java X.Y.Z-RC1
+
+### Critical Bug fix in HLL Sketch for Druid, minor licensing fixes, minor code cleanup. ###
+
+Hello Apache DataSketches PPMC and Community,
+
+1. This is a call for vote to release Apache DataSketches-java candidate version: X.Y.Z-RC1
+
+ NOTE 1: This is the core Java component of the DataSketches library that includes all the sketch algorithms in production-ready packages. These sketches can be called directly from this component or used in conjunction with the adaptor components such as Hadoop Pig, Hadoop Hive, or the aggregator adaptors built into Apache Druid.
+
+2. Source repository:
+ - https://github.com/apache/datasketches-java
+
+ Git Tag for this release:
+ - https://github.com/apache/datasketches-java/tree/X.Y.Z-RC1 on branch 1.3.X
+
+ Git HashId for this release starts with: abcdefg
+
+3. The Release Candidate / Zip Repository:
+ - https://dist.apache.org/repos/dist/dev/datasketches/java/X.Y.Z-RC1/
+
+ The public signing key can be found in the KEYS file:
+ - https://dist.apache.org/repos/dist/dev/incubator/datasketches/KEYS
+
+ The artifacts have been signed with --keyid-format SHORT : ABCDEFGH
+
+4. Repository: Maven Central [Nexus](http://repository.apache.org) (Jar Artifacts):
+ - https://repository.apache.org/content/groups/staging/org/apache/datasketches/datasketches-java/x.y.z/
+
+5. Build & Test Guide:
+ - https://github.com/apache/incubator-datasketches-java/blob/x.y.z-RC1/README.md
+
+6. The vote will be performed as follows:
+ - This letter will be published on dev@ and remain open for at least 72 hours (excluding weekends and holidays), AND at least 3 (+1) PMC votes or a majority of (+1) PMC votes are acquired. Anyone in the community can vote.
+
+Please vote accordingly:
+
+[ ] +1 approve
+[ ] +0 no opinion
+[ ] -1 disapprove with the reason
+
+Thanks,
+Lee Rhodes
+leerho@apache.org
\ No newline at end of file
Modified: dev/datasketches/scripts/APACHE_CPP_RELEASE_STEPS.md
==============================================================================
--- dev/datasketches/scripts/APACHE_CPP_RELEASE_STEPS.md (original)
+++ dev/datasketches/scripts/APACHE_CPP_RELEASE_STEPS.md Wed Jan 6 01:40:29 2021
@@ -51,53 +51,54 @@ __NOTES:__
## Create Permanent Release Branch & Python Version Preparation
-* Assume target version = A.B.0-incubating
+* Assume target version = A.B.0
* From IDE or Command Line:
- * Switch from master to new __Permanent Branch__: "A.B.X-incubating"
- * Check setup.py "version=" line to A.B.X-incubating (remove -SNAPSHOT, do not change A or B)
+ * Switch from master to new __Permanent Branch__: "A.B.X"
+ * Check setup.py "version=" line to A.B.X (remove -SNAPSHOT, do not change A or B)
* Commit the change. __DO NOT PUSH!__
- * Create Annotated TAG: A.B.0-incubating-RC1 (or RCn)
+ * Create Annotated TAG: A.B.0-RC1 (or RCn)
* Write down the Git hash : example: 40c6f4f
- * Now Push Branch "A.B.X-incubating" with edited setup.py to origin
+ * Now Push Branch "A.B.X" with edited setup.py to origin
* __DO NOT MERGE THIS PERMANENT BRANCH INTO MASTER__
* From IDE or Command-line:
- * Do explicit push of tags on branch "A.B.X-incubating" to origin:
+ * Do explicit push of tags on branch "A.B.X" to origin:
* $ git push origin --tags
-* From a web browser at origin web site: github.com/apache/incubator-datasketches-\<component\>
- * Select the A.B.X-incubating branch
- * Confirm that the tag: A.B.0-incubating-RC1 exists and that the tag is on the latest commit and with the correct Git hash.
+* From a web browser at origin web site: github.com/apache/datasketches-\<component\>
+ * Select the A.B.X branch
+ * Confirm that the tag: A.B.0-RC1 exists and that the tag is on the latest commit and with the correct Git hash.
* __DO NOT CREATE PR OR MERGE THIS PERMANENT BRANCH INTO MASTER__
* From IDE or Command Line:
- * Confirm that the tag A.B.0-incubating-RC1 and the branch A.B.X-incubating, and HEAD coincide with the correct Git hash.
+ * Confirm that the tag A.B.0-RC1 and the branch A.B.X, and HEAD coincide with the correct Git hash.
* Confirm that there are no unstaged or staged changes.
* Return to master branch
- * Edit master setup.py to A'.B'.0-incubating-SNAPSHOT where A' or B' will be incremented by 1. (Bug fix releases will change the 3rd digit)
- * Commit and Push this change to origin/master with the comment "Release Process: Change setup.py version to A'.B'.0-incubating-SNAPSHOT."
- * Return to release branch A.B.X-incubating
+ * Edit master setup.py to A'.B'.0-SNAPSHOT where A' or B' will be incremented by 1. (Bug fix releases will change the 3rd digit)
+ * Commit and Push this change to origin/master with the comment "Release Process: Change setup.py version to A'.B'.0-SNAPSHOT."
+ * Return to release branch A.B.X
* You may minimize your IDE, pointing at the release branch.
-
-## Create and/or Checkout Local "Dist" directories on your system
+
+## Create and/or Checkout Local *dist/dev* directories on your system
* If you have not already, on your system create the two directory structures that mirror the dist.apache.org/repos/ directories:
- * mkdir dist/dev/incubator/datasketches/
- * mkdir dist/release/incubator/datasketches/
+ * mkdir dist/dev/datasketches/
+ * mkdir dist/release/datasketches/
* Checkout both "dev" and "release" directories
- * Open a terminal in the dist/dev/incubator/datasketches directory and do a checkout:
- * svn co https://dist.apache.org/repos/dist/dev/incubator/datasketches/ . #Note the DOT
+ * Open a terminal in the dist/dev/datasketches directory and do a checkout:
+ * svn co https://dist.apache.org/repos/dist/dev/datasketches/ . #Note the DOT
* svn status # make sure it is clean
- * Open a terminal in the dist/release/incubator/datasketches directory and do a checkout:
- * svn co https://dist.apache.org/repos/dist/release/incubator/datasketches/ . #Note the DOT
+ * Open a terminal in the dist/release/datasketches directory and do a checkout:
+ * svn co https://dist.apache.org/repos/dist/release/datasketches/ . #Note the DOT
* svn status # make sure it is clean
-## Create Zip Files for dist.apache.org
+## Create the Candidate Apache Release Distribution on *dist/dev*
+### Create primary zip files & signatures
* You will need the following arguments:
* Absolute path of target project.basedir on your system
* Artifact name : datasketches-\<component\> where component is e.g., cpp
- * GitHub Tag: A.B.0-incubating-RC1 (or RCn)
-* Start a new terminal in the above dist/dev/incubator/datasketches/scripts directory on your system:
+ * GitHub Tag: A.B.0-RC1 (or RCn)
+* Start a new terminal in the above dist/dev/datasketches/scripts directory on your system:
* Confirm GPG is running: $ env | grep GPG
* If not: $ eval $(gpg-agent --daemon)
* Run something like:
- * $ ./bashDeployToDist.sh /Users/\<name\>/dev/git/Apache/datasketches-\<component\> datasketches-\<component\> A.B.0-incubating-RC1
+ * $ ./bashDeployToDist.sh /Users/\<name\>/dev/git/Apache/datasketches-\<component\> datasketches-\<component\> A.B.0-RC1
* Follow the instructions.
* NOTE: if you get the error "gpg: signing failed: No pinentry":
* open .gnupg/gpg-agent.conf
@@ -105,53 +106,64 @@ __NOTES:__
* reload the gpg agent in the terminal: gpg-connect-agent reloadagent /bye
* restart the ./bashDeployToDist script
* Close the terminal
-* Check and grab the web URL ~ https://dist.apache.org/repos/dist/dev/incubator/datasketches/\<component\>/A.B.0-incubating-RC1/
+* Check and grab the web URL ~ https://dist.apache.org/repos/dist/dev/datasketches/\<component\>/A.B.0-RC1/
* There should be 3 files: \*-src.zip, \*-src.zip.asc, \*-src.zip.sha512
-## Prepare & Send Vote Letter for PPMC Stage 1
+### Create Copy of External Artifact Distributions
+* For Java, we need to place copies of the artifact jars deployed to Nexus under a "maven" directory.
+* For external artifacts of Python or Docker it will be something else.
+* For example see <https://dist.apache.org/repos/dist/release/datasketches/java/1.3.0-incubating/>
+* These must be signed with GPG (.asc) and SHA512 (.sha512)
+* I will create a script for these artifacts someday :)
+
+## Prepare & Send [VOTE] Letter to dev@
* See VoteTemplates directory for a recent example
+* If vote is not successful, fix the problem and repeat above steps.
* After a successful vote return to __this point__ and continue ...
-## Prepare & Send Vote Letter for IPMC Stage 2
+## Prepare & Send [VOTE-RESULT] Letter to dev@
* See VoteTemplates directory for a recent example
+* Declare that the vote is closed.
* Summarize PPMC vote results
-* After a successful vote return to __this point__ and continue ...
-## Move RC files from dist/dev to dist/release
-* In local dist/__dev__/incubator/datasketches/
+## Move files from dev/staging to release
+### Move primary zip files from *dist/dev* to *dist/release*
+* In local dist/__dev__/datasketches/
* Open Terminal #1
* Perform SVN Checkout:
- * $ svn co https://dist.apache.org/repos/dist/dev/incubator/datasketches/ . #note dot at end
-* In local dist/__release__/incubator/datasketches/
+ * $ svn co https://dist.apache.org/repos/dist/dev/datasketches/ . #note dot at end
+* In local dist/__release__/datasketches/
* Open Terminal #2
* Perform SVN Checkout:
- * $ svn co https://dist.apache.org/repos/dist/release/incubator/datasketches/ . #note dot at end
+ * $ svn co https://dist.apache.org/repos/dist/release/datasketches/ . #note dot at end
* Create new version directory under appropriate component directory:
- * $ mkdir -p \<component\>/A.B.0-incubating
+ * $ mkdir -p \<component\>/A.B.0
* Using local file system copy files
- * From ... /dist/dev/incubator/datasketches/\<component\>/version-RCnn/*
- * To ... /dist/release/incubator/datasketches/\<component\>/version (no RCnn)/*
- * Using Terminal #2 at ... /dist/release/incubator/datasketches directory:
+ * From ... /dist/dev/datasketches/\<component\>/version-RCnn/*
+ * To ... /dist/release/datasketches/\<component\>/version (no RCnn)/*
+ * Using Terminal #2 at ... /dist/release/datasketches directory:
* svn add . --force
- * svn ci -m "Release A.B.0-incubating"
+ * svn ci -m "Release A.B.0"
* Remove the prior release...
- * svn remove \<component\>/X.Y.0-incubating
+ * svn remove \<component\>/X.Y.0
* svn ci -m "Remove Prior release"
* svn status # should be empty
* Using local file system
- * Delete the prior X.Y.0-incubating directory
+ * Delete the prior X.Y.0 directory
+
+### Move External Artifact Distributions *dist/dev* to *dist/release*
## Create & Document Release Tag on GitHub
-* Open your IDE and switch to the recently created Release Branch A.B.X-incubating
-* Find the recently created A.B.0-incubating-RCn tag in that branch
-* At that same GitHub ID hash, create a new tag A.B.0-incubating (without the RCn).
+* Open your IDE and switch to the recently created Release Branch A.B.X
+* Find the recently created A.B.0-RCn tag in that branch
+* At that same GitHub ID hash, create a new tag A.B.0 (without the RCn).
* From the Command Line: Push the new tag to origin:
* $ git push origin --tags
* On the GitHub component site document the release
## Update Website Downloads.md "Latest Source Zip Files" Table
* This script assumes that the remote .../dist/release/datasketches/... directories are up-to-date with no old releases.
-* Start a new terminal in the ../dist/dev/incubator/datasketches/scripts directory on your system:
+* Start a new terminal in the ../dist/dev/datasketches/scripts directory on your system:
* Make sure you local website directory is pointing to master and up-to-date.
* Run the following with the argument specifying the location of your local website directory:
* $ ./createDownloadsInclude.sh /Users/\<name\>/ ... /datasketches-website
@@ -159,11 +171,12 @@ __NOTES:__
## Update Javadocs (or Equivalent) on Website
-## Prepare Announce Letter
+## Update Website Documentation (if new functionality)
+
+## Prepare Announce Letter to dev@
* ASF requests that you wait 24 hours to publish Announce letter to allow the propagation to mirrors.
* Use recent template
-* Summarize Stage 2 vote results
-* Send to general@incubator.apache.org and dev@datasketches.apache.org
+* Summarize vote results
## Update These Instructions
* If you have updated this file or any of the scripts, please check it in using SVN using your local dist/dev directory copy:
Modified: dev/datasketches/scripts/APACHE_JAVA_RELEASE_STEPS.md
==============================================================================
--- dev/datasketches/scripts/APACHE_JAVA_RELEASE_STEPS.md (original)
+++ dev/datasketches/scripts/APACHE_JAVA_RELEASE_STEPS.md Wed Jan 6 01:40:29 2021
@@ -66,59 +66,60 @@ __NOTES:__
* -tests.jar
* -.jar
* Check your local Maven repository
- * _~/.m2/repository/org/apache/datasketches/datasketches-\<component\>/A.B.0-incubating-SNAPSHOT/_
+ * _~/.m2/repository/org/apache/datasketches/datasketches-\<component\>/A.B.0-SNAPSHOT/_
* It should have 5 new jars and a .pom file.
## Create Permanent Release Branch & POM Version Preparation
-* Assume current master POM version = A.B.0-incubating-SNAPSHOT
+* Assume current master POM version = A.B.0-SNAPSHOT
* From IDE or Command Line:
- * Switch from Master to new __Permanent Branch__: "A.B.X-incubating"
- * Edit pom.xml version to A.B.0-incubating (remove -SNAPSHOT, do not change A or B)
+ * Switch from Master to new __Permanent Branch__: "A.B.X"
+ * Edit pom.xml version to A.B.0 (remove -SNAPSHOT, do not change A or B)
* Commit the change. __DO NOT PUSH!__
- * Create Annotated TAG: A.B.0-incubating-RC1 (or RCn)
+ * Create Annotated TAG: A.B.0-RC1 (or RCn)
* Write down the Git hash : example: 40c6f4f
- * Now Push Branch "A.B.X-incubating" with edited pom.xml to origin
+ * Now Push Branch "A.B.X" with edited pom.xml to origin
* __DO NOT MERGE THIS PERMANENT BRANCH INTO MASTER__
* From IDE or Command-line:
- * Do explicit push of tags on branch "A.B.X-incubating" to origin:
+ * Do explicit push of tags on branch "A.B.X" to origin:
* $ git push origin --tags
-* From a web browser at origin web site: github.com/apache/incubator-datasketches-\<component\>
- * Select the A.B.X-incubating branch
- * Confirm that the tag: A.B.0-incubating-RC1 exists and that the tag is on the latest commit and with the correct Git hash.
+* From a web browser at origin web site: github.com/apache/datasketches-\<component\>
+ * Select the A.B.X branch
+ * Confirm that the tag: A.B.0-RC1 exists and that the tag is on the latest commit and with the correct Git hash.
* __DO NOT CREATE PR OR MERGE THIS PERMANENT BRANCH INTO MASTER__
* From IDE or Command Line:
- * Confirm that the tag A.B.0-incubating-RC1 and the branch A.B.X-incubating, and HEAD coincide with the correct Git hash.
+ * Confirm that the tag A.B.0-RC1 and the branch A.B.X, and HEAD coincide with the correct Git hash.
* Confirm that there are no unstaged or staged changes.
* Return to master branch
- * Edit master pom.xml to A'.B'.0-incubating-SNAPSHOT where A' or B' will be incremented by 1. (Bug fix releases will change the 3rd digit)
- * Commit and Push this change to origin/master with the comment "Release Process: Change pom version to A'.B'.0-incubating-SNAPSHOT."
- * Return to release branch A.B.X-incubating
+ * Edit master pom.xml to A'.B'.0-SNAPSHOT where A' or B' will be incremented by 1. (Bug fix releases will change the 3rd digit)
+ * Commit and Push this change to origin/master with the comment "Release Process: Change pom version to A'.B'.0-SNAPSHOT."
+ * Return to release branch A.B.X
* You may minimize your IDE, pointing at the release branch.
-## Create and/or Checkout Local "Dist" directories on your system
+## Create and/or Checkout Local *dist/dev* directories on your system
* If you have not already, on your system create the two directory structures that mirror the dist.apache.org/repos/ directories:
- * mkdir dist/dev/incubator/datasketches/
- * mkdir dist/release/incubator/datasketches/
+ * mkdir dist/dev/datasketches/
+ * mkdir dist/release/datasketches/
* Checkout both "dev" and "release" directories
- * Open a terminal in the dist/dev/incubator/datasketches directory and do a checkout:
- * svn co https://dist.apache.org/repos/dist/dev/incubator/datasketches/ . #Note the DOT
+ * Open a terminal in the dist/dev/datasketches directory and do a checkout:
+ * svn co https://dist.apache.org/repos/dist/dev/datasketches/ . #Note the DOT
* svn status # make sure it is clean
- * Open a terminal in the dist/release/incubator/datasketches directory and do a checkout:
- * svn co https://dist.apache.org/repos/dist/release/incubator/datasketches/ . #Note the DOT
+ * Open a terminal in the dist/release/datasketches directory and do a checkout:
+ * svn co https://dist.apache.org/repos/dist/release/datasketches/ . #Note the DOT
* svn status # make sure it is clean
-## Create Zip Files for dist.apache.org
+## Create the Candidate Apache Release Distribution on *dist/dev*
+### Create primary zip files & signatures
* You will need the following arguments:
* Absolute path of target project.basedir on your system
* Project.artifactId : datasketches-\<component\> where component is e.g., java, pig, hive,...
- * GitHub Tag: A.B.0-incubating-RC1 (or RCn)
+ * GitHub Tag: A.B.0-RC1 (or RCn)
* Have your GPG passphrase handy -- you have only a few seconds to enter it!
-* Start a new terminal in the above dist/dev/incubator/datasketches/scripts directory on your system:
+* Start a new terminal in the above dist/dev/datasketches/scripts directory on your system:
* Confirm GPG is running: $ env | grep GPG
* If not: $ eval $(gpg-agent --daemon)
* Run something like:
- * $ ./bashDeployToDist.sh /Users/\<name\>/dev/git/Apache/datasketches-\<component\> datasketches-\<component\> A.B.0-incubating-RC1
+ * $ ./bashDeployToDist.sh /Users/\<name\>/dev/git/Apache/datasketches-\<component\> datasketches-\<component\> A.B.0-RC1
* Follow the instructions.
* NOTE: if you get the error "gpg: signing failed: No pinentry":
* open .gnupg/gpg-agent.conf
@@ -126,14 +127,14 @@ __NOTES:__
* reload the gpg agent in the terminal: gpg-connect-agent reloadagent /bye
* restart the ./bashDeployToDist script
* Close the terminal
-* Check and grab the web URL ~ https://dist.apache.org/repos/dist/dev/incubator/datasketches/\<component\>/A.B.0-incubating-RC1/
+* Check and grab the web URL ~ https://dist.apache.org/repos/dist/dev/datasketches/\<component\>/A.B.0-RC1/
* There should be 3 files: \*-src.zip, \*-src.zip.asc, \*-src.zip.sha512
-## Push Jars to Nexus (Maven Central) Staging
+### Java: Push Jars to Nexus (Maven Central) Staging
* Return to original terminal at the project.basedir
* If starting new terminal make sure GPG is running: $ env | grep GPG
* If not: $ eval $(gpg-agent --daemon)
-* $ git status # make sure you are still on the release branch: _A.B.X-incubating_
+* $ git status # make sure you are still on the release branch: _A.B.X
* TRIAL-RUN:
* $ mvn clean install -Pnexus-jars -DskipTests=true
* Check that jars & pom have .asc signatures
@@ -141,48 +142,58 @@ __NOTES:__
* $ mvn clean deploy -Pnexus-jars -DskipTests=true
* Login to [repository.apache.org](https://repository.apache.org/) / Staging Repositories for orgapachedatasketches-XXXX
* Click Content and search to the end. Each jar & pom should have .asc, .md5, .sha1 signatures
- * [CLOSE] the Staging Repository with a comment: "\<component\> A.B.0-incubating"
- * Confirm its existance under Repositories/Staging web-site : org/apache/datasketches-\<component\>/A.B.0-incubating
+ * [CLOSE] the Staging Repository with a comment: "\<component\> A.B.0"
+ * Confirm its existance under Repositories/Staging web-site : org/apache/datasketches-\<component\>/A.B.0
* Grab its URL while there. You will need it for the Vote Letter.
* Check your local Maven repository
- * _~/.m2/repository/org/apache/datasketches/datasketches-\<component\>/A.B.0-incubating/_
+ * _~/.m2/repository/org/apache/datasketches/datasketches-\<component\>/A.B.0/_
* It should have 5 new jars and a .pom file each with .asc, .md5, and .sha1 signatures
+### Create Copy of External Artifact Distributions
+* For Java, we need to place copies of the artifact jars deployed to Nexus under a "maven" directory.
+* For external artifacts of Python or Docker it will be something else.
+* For example see <https://dist.apache.org/repos/dist/release/datasketches/java/1.3.0-incubating/>
+* These must be signed with GPG (.asc) and SHA512 (.sha512)
+* I will create a script for these artifacts someday :)
-## Prepare & Send Vote Letter for PPMC Stage 1
+## Prepare & Send [VOTE] Letter to dev@
* See VoteTemplates directory for a recent example
+* If vote is not successful, fix the problem and repeat above steps.
* After a successful vote return to __this point__ and continue ...
-## Prepare & Send Vote Letter for IPMC Stage 2
+## Prepare & Send [VOTE-RESULT] Letter to dev@
* See VoteTemplates directory for a recent example
-* Summarize PPMC vote results
-* After a successful vote return to __this point__ and continue ...
+* Declare that the vote is closed.
+* Summarize vote results
-## Move RC files from dist/dev to dist/release
-* In local dist/__dev__/incubator/datasketches/
+## Move files from dev/staging to release
+### Move primary zip files *dist/dev* to *dist/release*
+* In local dist/__dev__/datasketches/
* Open Terminal #1
* Perform SVN Checkout:
- * $ svn co https://dist.apache.org/repos/dist/dev/incubator/datasketches/ . #note dot at end
-* In local dist/__release__/incubator/datasketches/
+ * $ svn co https://dist.apache.org/repos/dist/dev/datasketches/ . #note dot at end
+* In local dist/__release__/datasketches/
* Open Terminal #2
* Perform SVN Checkout:
- * $ svn co https://dist.apache.org/repos/dist/release/incubator/datasketches/ . #note dot at end
+ * $ svn co https://dist.apache.org/repos/dist/release/datasketches/ . #note dot at end
* Create new version directory under appropriate component directory:
- * $ mkdir -p \<component\>/A.B.0-incubating
+ * $ mkdir -p \<component\>/A.B.0
* Using local file system copy files
- * From ... /dist/dev/incubator/datasketches/\<component\>/version-RCnn/*
- * To ... /dist/release/incubator/datasketches/\<component\>/version (no RCnn)/*
- * Using Terminal #2 at ... /dist/release/incubator/datasketches directory:
+ * From ... /dist/dev/datasketches/\<component\>/version-RCnn/*
+ * To ... /dist/release/datasketches/\<component\>/version (no RCnn)/*
+ * Using Terminal #2 at ... /dist/release/datasketches directory:
* svn add . --force
- * svn ci -m "Release A.B.0-incubating"
+ * svn ci -m "Release A.B.0"
* Remove the prior release...
- * svn remove \<component\>/X.Y.0-incubating
+ * svn remove \<component\>/X.Y.0
* svn ci -m "Remove Prior release"
* svn status # should be empty
* Using local file system
- * Delete the prior X.Y.0-incubating directory
+ * Delete the prior X.Y.0 directory
+
+### Move External Artifact Distributions *dist/dev* to *dist/release*
-## Release Jars on Nexus Staging
+### Java: Release Jars on Nexus Staging
* On Nexus [repository.apache.org](https://repository.apache.org/) click on Staging Repositories
* Select "orgapachedatasketches-XXXX" (If more than one make sure you select the right one!)
* At the top of the window, select "Release"
@@ -190,16 +201,16 @@ __NOTES:__
* Browse to *Releases/org/apache/datasketches/...
## Create & Document Release Tag on GitHub
-* Open your IDE and switch to the recently created Release Branch A.B.X-incubating
-* Find the recently created A.B.0-incubating-RCn tag in that branch
-* At that same GitHub ID hash, create a new tag A.B.0-incubating (without the RCn).
+* Open your IDE and switch to the recently created Release Branch A.B.X
+* Find the recently created A.B.0-RCn tag in that branch
+* At that same GitHub ID hash, create a new tag A.B.0 (without the RCn).
* From the Command Line: Push the new tag to origin:
* $ git push origin --tags
* On the GitHub component site document the release
## Update Website Downloads.md "Latest Source Zip Files" Table
* This script assumes that the remote .../dist/release/datasketches/... directories are up-to-date with no old releases.
-* Start a new terminal in the ../dist/dev/incubator/datasketches/scripts directory on your system:
+* Start a new terminal in the ../dist/dev/datasketches/scripts directory on your system:
* Make sure you local website directory is pointing to master and up-to-date.
* Run the following with the argument specifying the location of your local website directory:
* $ ./createDownloadsInclude.sh /Users/\<name\>/ ... /datasketches-website
@@ -207,11 +218,12 @@ __NOTES:__
## Update Javadocs (or Equivalent) on Website
-## Prepare Announce Letter
+## Update Website Documentation (if new functionality)
+
+## Prepare Announce Letter to dev@
* ASF requests that you wait 24 hours to publish Announce letter to allow the propagation to mirrors.
* Use recent template
-* Summarize Stage 2 vote results
-* Send to general@incubator.apache.org and dev@datasketches.apache.org
+* Summarize vote results
## Update These Instructions
* If you have updated this file or any of the scripts, please check it in using SVN using your local dist/dev directory copy:
Modified: dev/datasketches/scripts/bashDeployToDist.sh
==============================================================================
--- dev/datasketches/scripts/bashDeployToDist.sh (original)
+++ dev/datasketches/scripts/bashDeployToDist.sh Wed Jan 6 01:40:29 2021
@@ -27,10 +27,10 @@
# \$1 = absolute path of project.basedir This is so this script can be run from any directory.
# \$2 = project.artifactId Example: datasketches-memory
# \$3 = GitHub Tag for this deployment
-# Example tag for SNAPSHOT : 1.0.0-incubating-SNAPSHOT
-# Example tag for Release Candidate: 1.0.0-incubating-RC1
-# Example tag for Release : 1.0.0-incubating
-# For example: $ <this script>.sh <project base dir> datasketches-memory 1.0.0-incubating-RC1 <website project dir>
+# Example tag for SNAPSHOT : 1.0.0-SNAPSHOT
+# Example tag for Release Candidate: 1.0.0-RC1
+# Example tag for Release : 1.0.0
+# For example: $ <this script>.sh <project base dir> datasketches-memory 1.0.0-RC1 <website project dir>
if [ -z "$1" ]; then echo "Missing project.basedir"; exit 1; fi
if [ -z "$2" ]; then echo "Missing project.artifactId"; exit 1; fi
@@ -43,22 +43,18 @@ echo
echo "2. Verify that you can successfully read and write to the dist directories using SVN."
echo
echo "3. Verify that your GPG keys have been created and stored in:"
-echo " - https://dist.apache.org/repos/dist/dev/incubator/datasketches/KEYS AND"
-echo " - https://dist.apache.org/repos/dist/release/incubator/datasketches/KEYS"
+echo " - https://dist.apache.org/repos/dist/dev/datasketches/KEYS AND"
+echo " - https://dist.apache.org/repos/dist/release/datasketches/KEYS"
echo
echo "4. Run all Unit Tests, Strict Profiles, CheckStyle, SpotBugs, Clover, etc."
echo
-echo "5. For RCs and Releases locally create a release branch with a name of one of the following forms:"
+echo "5. For RCs and Releases locally create a release branch with a name of the following form:"
echo " 1.0.X"
-echo " 1.0.X-incubating"
echo
echo "6. Locally create a tag of one of the following forms:"
echo " 1.0.0"
echo " 1.0.0-SNAPSHOTnn"
echo " 1.0.0-RCNN"
-echo " 1.0.0-incubating"
-echo " 1.0.0-incubating-SNAPSHOTnn"
-echo " 1.0.0-incubating-RCnn"
echo
echo " 'SNAPSHOT', if relevant, is always capitalized."
echo " Note: SNAPSHOT deployments are never relevant for the 'dist/release' branch."
@@ -133,7 +129,7 @@ else
echo "Next: Setup the paths"
echo "Proceed? [y|N]"; read confirm; if [[ $confirm != "y" ]]; then echo "Please rerun this script when ready."; exit 1; fi
Release=true
- FileVersion="$Tag" #looks like 1.0.0 or 1.0.0-incubating, no "-RCnn"
+ FileVersion="$Tag" #looks like 1.0.0, no "-RCnn"
LeafDir=$Tag
fi
fi
@@ -141,14 +137,6 @@ fi
# extract the SubDir name, e.g., "memory" from the artifactId
SubDir=$(expr "$ProjectArtifactId" : 'datasketches-\([a-z]*\)')
-# Are we still incubating?
-if [[ $Tag =~ .*-incubating.* ]]
-then
- Incubator="incubator/" #part of file path
-else
- Incubator=""
-fi
-
# Set up the paths
FilesPath=${SubDir}/${LeafDir}
@@ -156,11 +144,11 @@ LocalPath="target/assy-tmp/dist"
RemotePath="https://dist.apache.org/repos/dist"
if ( $Release )
then
- LocalSvnBasePath="$LocalPath"/release/"$Incubator"datasketches
- RemoteSvnBasePath="$RemotePath"/release/"$Incubator"datasketches
+ LocalSvnBasePath="$LocalPath"/release/datasketches
+ RemoteSvnBasePath="$RemotePath"/release/datasketches
else
- LocalSvnBasePath="$LocalPath"/dev/"$Incubator"datasketches
- RemoteSvnBasePath="$RemotePath"/dev/"$Incubator"datasketches
+ LocalSvnBasePath="$LocalPath"/dev/datasketches
+ RemoteSvnBasePath="$RemotePath"/dev/datasketches
fi
LocalFilesPath="$LocalSvnBasePath"/"$FilesPath"
@@ -178,7 +166,6 @@ echo "===========SUMMARY OF INPUT PARAME
echo "ProjectBaseDir : $ProjectBaseDir"
echo "ProjectArtifactId : $ProjectArtifactId"
echo "Tag : $Tag"
-echo "Incubator Path : $Incubator"
echo "File Version String : $FileVersion"
echo "ZIP Directory : $ZipPrefix"
echo "ZIP File Name : $ZipName"
@@ -233,7 +220,7 @@ mv target/$ZipName $LocalFilesPath
echo
echo "Open the Zip file: $ZipName"
echo "Is the Zip file content correct?"
-echo "Examine it at /target/assy-tmp/dist/dev/incubator/datasketches/$SubDir/$Tag/$ZipName"
+echo "Examine it at /target/assy-tmp/dist/dev/datasketches/$SubDir/$Tag/$ZipName"
echo "Next: Create GPG and SHA512 signatures"
echo "Proceed? [y|N]"; read confirm; if [[ $confirm != "y" ]]; then echo "Please rerun this script when ready."; exit 1; fi
Modified: dev/datasketches/scripts/createDownloadsInclude.sh
==============================================================================
--- dev/datasketches/scripts/createDownloadsInclude.sh (original)
+++ dev/datasketches/scripts/createDownloadsInclude.sh Wed Jan 6 01:40:29 2021
@@ -18,7 +18,7 @@
# under the License.
# Update website _includes/downloadsinclude.txt, which creates the Latest Source Zip Files table on the website Downloads page.
-# This scans the dist.apache.org/repos/dist/release/incubator/datasketches/ directory for current releases.
+# This scans the dist.apache.org/repos/dist/release/datasketches/ directory for current releases.
# It assumes that the directory has been cleaned of older releases, otherwise the older releases will show up in the website
# table. The table is created and overwrites the existing /_includes/downloadsInclude.txt.
# This is a generic bash script in that it does not assume a POM file and does not use Maven or git. It does use SVN.
@@ -37,7 +37,7 @@ echo
echo "Proceed? [y|N]"; read confirm; if [[ ${confirm} != "y" ]]; then echo "Please rerun this script when ready."; exit 1; fi
# SVN Checkout Release Path
-RemoteSvnRelDS="https://dist.apache.org/repos/dist/release/incubator/datasketches/"
+RemoteSvnRelDS="https://dist.apache.org/repos/dist/release/datasketches/"
# Create tmp subdirectory, which will be removed at the end
rm -rf tmp # remove tmp if it exists
@@ -47,9 +47,9 @@ mkdir -p tmp
svn co --quiet ${RemoteSvnRelDS} tmp
# Define Base Fragments
-DLBase="[Download](https://www.apache.org/dyn/closer.lua/incubator/datasketches/"
-SigBase="[Signature](https://downloads.apache.org/incubator/datasketches/"
-HashBase="[Hash](https://downloads.apache.org/incubator/datasketches/"
+DLBase="[Download](https://www.apache.org/dyn/closer.lua/datasketches/"
+SigBase="[Signature](https://downloads.apache.org/datasketches/"
+HashBase="[Hash](https://downloads.apache.org/datasketches/"
HEAD1=$'| Component | Release | ZIP | ASC | SHA512 | Date-Time | SVN ID | Committer |\n|:---------:|:-------:|:---:|:---:|:------:|:---------:|:------:|:---------:|'
Modified: dev/datasketches/scripts/createZip.sh
==============================================================================
--- dev/datasketches/scripts/createZip.sh (original)
+++ dev/datasketches/scripts/createZip.sh Wed Jan 6 01:40:29 2021
@@ -20,10 +20,9 @@
ZipName=$1
LocalPath=$2 # target/assy-tmp/dist/dev/incubator/datasketches/memory/<leafDir>
-# what should be included is a shorter list that all possible excludes!
+# what should be included is a shorter list than all possible excludes!
cp .travis.yml $LocalPath
cp .gitignore $LocalPath
-cp DISCLAIMER $LocalPath
cp LICENSE $LocalPath
cp NOTICE $LocalPath
cp pom.xml $LocalPath
Modified: dev/datasketches/scripts/moveDevToRelease.sh
==============================================================================
--- dev/datasketches/scripts/moveDevToRelease.sh (original)
+++ dev/datasketches/scripts/moveDevToRelease.sh Wed Jan 6 01:40:29 2021
@@ -27,7 +27,7 @@
# \$3 = GitHub RC Tag for this deployment
# \$4 = don't use this for normal opertion, otherwise any valid text (e.g. "test") means "test mode"
#
-# For example: $ <this script>.sh <project base dir> datasketches-memory 1.0.0-incubating-RC1
+# For example: $ <this script>.sh <project base dir> datasketches-memory 1.0.0-RC1
if [ -z "$1" ]; then echo "Missing project.basedir"; exit 1; fi
if [ -z "$2" ]; then echo "Missing project.artifactId"; exit 1; fi
@@ -38,9 +38,8 @@ echo
echo "===================Check List======================"
echo "1. Verify that you can successfully read and write to the dist directories using SVN."
echo
-echo "2. The given GitHub RC Tag must be one of the following forms:"
+echo "2. The given GitHub RC Tag must be of the following form:"
echo " 1.0.0-RCnn"
-echo " 1.0.0-incubating-RCnn"
echo
echo "Next: parse input parameters."
echo "Proceed? [y|N]"; read confirm; if [[ ${confirm} != "y" ]]; then echo "Please rerun this script when ready."; exit 1; fi
@@ -60,14 +59,6 @@ RCTag=$3
# extract the Module name, e.g., "memory" from the artifactId
Module=$(expr ${ProjectArtifactId} : 'datasketches-\([a-z]*\)')
-# Are we still incubating?
-if [[ ${RCTag} =~ .*-incubating.* ]]
-then
- Incubator="incubator/" #part of file path
-else
- Incubator=""
-fi
-
## Does RCTag have -RCNN ?
if [[ ${RCTag} =~ .*-[rR][cC][0-9][0-9]* ]];
then
@@ -89,10 +80,10 @@ RemoteBase="https://dist.apache.org/repo
DevModuleRCVersion=${Module}/${RCVersion}
ReleaseModuleRVersion=${Module}/${ReleaseVersion}
-LocalBaseDevDS=${LocalBaseDist}/dev/${Incubator}datasketches
-LocalBaseReleaseDS=${LocalBaseDist}/release/${Incubator}datasketches
-RemoteBaseDevDS=${RemoteBase}/dev/${Incubator}datasketches
-RemoteBaseReleaseDS=${RemoteBase}/release/${Incubator}datasketches
+LocalBaseDevDS=${LocalBaseDist}/dev/datasketches
+LocalBaseReleaseDS=${LocalBaseDist}/release/datasketches
+RemoteBaseDevDS=${RemoteBase}/dev/datasketches
+RemoteBaseReleaseDS=${RemoteBase}/release/datasketches
LocalBaseDevDSModuleRCVersion=${LocalBaseDevDS}/${DevModuleRCVersion}
LocalBaseReleaseDSModuleRVersion=${LocalBaseReleaseDS}/${ReleaseModuleRVersion}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org