Merge remote-tracking branch 'upstream/7.0.x' into 7.1.x

Author: jdaugherty

.github/scripts/releaseDistributions.sh

@@ -19,21 +19,24 @@
 #  under the License.
 #
 
-# ./releaseDistributions.sh <tag> <username> <password>
+# ./releaseDistributions.sh <tag> <svn_folder> <username>
 
 set -euo pipefail
 
 if [[ $# -ne 3 ]]; then
-  echo "Usage: $0 <tag> <username> <password>" >&2
+  echo "Usage: $0 <tag> <svn_folder> <username>" >&2
   exit 1
 fi
 
 RELEASE_TAG="$1"
 RELEASE_VERSION="${RELEASE_TAG#v}"
-SVN_USER="$2"
-SVN_PASS="$3"
-RELEASE_ROOT="https://dist.apache.org/repos/dist/release/grails/core"
-DEV_ROOT="https://dist.apache.org/repos/dist/dev/grails/core"
+SVN_FOLDER="$2"
+SVN_USER="$3"
+RELEASE_ROOT="https://dist.apache.org/repos/dist/release/grails/${SVN_FOLDER}"
+DEV_ROOT="https://dist.apache.org/repos/dist/dev/grails/${SVN_FOLDER}"
+
+read -r -s -p "Password: " SVN_PASS
+echo
 
 if [[ -z "${RELEASE_TAG}" ]]; then
   echo "❌ ERROR: Release Tag must not be empty." >&2

.github/scripts/releaseJarFiles.sh

@@ -19,19 +19,20 @@
 #  under the License.
 #
 
-# ./releaseJarFiles.sh <staging repo description> <username> <password>
+# ./releaseJarFiles.sh <staging repo description> <username>
 
 set -euo pipefail
 
-if [[ $# -ne 3 ]]; then
-  echo "Usage: $0 <staging repo description> <username> <password>" >&2
+if [[ $# -ne 2 ]]; then
+  echo "Usage: $0 <staging repo description> <username>" >&2
   exit 1
 fi
 
 NEXUS_URL="https://repository.apache.org"
 STAGING_DESCRIPTION="$1"
 NEXUS_USER="$2"
-NEXUS_PASS="$3"
+read -r -s -p "Password: " NEXUS_PASS
+echo
 
 if [[ -z "${STAGING_DESCRIPTION}" ]]; then
   echo "ERROR: Staging Description must not be empty." >&2

.github/vote_templates/announce.txt

@@ -1,22 +1,20 @@
-The Apache Grails community is pleased to announce the release of Apache Grails ${VERSION}.
+The Apache Grails community is pleased to announce the release of ${PROJECT_NAME} ${VERSION}.
 
-Grails is a powerful Groovy-based web application framework for the JVM built on top of Spring Boot that has many plugins to further extend its functionality.
-
-This release another milestone on our journey to a final 7.0 release. Users are encouraged to try the milestone to provide early feedback. Detailed upgrade instructions are available here: https://grails.apache.org/docs/${VERSION}/guide/upgrading.html
+${PROJECT_DESC}
 
 The release notes are available here:
-<blog post link>
+https://github.com/${REPO_SLUG}/releases/tag/${TAG}
 
 For the complete list of changes:
-https://github.com/apache/grails-core/compare/v${PREVIOUS_VERSION}...v${VERSION}
+https://github.com/${REPO_SLUG}/compare/v<PREVIOUS_VERSION>...${TAG}
 
 Apache Grails website: https://grails.apache.org/
 
 Download Links: https://grails.apache.org/download.html
 
 Grails Resources:
-- Grails GitHub repo: https://github.com/apache/grails-core
-- Issues: https://github.com/apache/grails-core/issues
+- Grails GitHub repo: https://github.com/${REPO_SLUG}
+- Issues: https://github.com/${REPO_SLUG}/issues
 - Mailing lists: https://grails.apache.org/community.html
 
 Happy Coding,

.github/vote_templates/staged.txt

@@ -1,6 +1,6 @@
 Hi Everyone,
 
-I am happy to start the VOTE thread for an Apache Grails release of version ${VERSION}!
+I am happy to start the VOTE thread to release ${PROJECT_NAME} ${VERSION}!
 
 
 Please note the following build reproducibility issues for this release:
@@ -13,20 +13,20 @@ Pre-release discussion thread is here:
 <Thread Link>
 
 Release notes for the release are here:
-https://github.com/apache/grails-core/releases/tag/v${VERSION}
+https://github.com/${REPO_SLUG}/releases/tag/${TAG}
 
 The tag for this release is:
-https://github.com/apache/grails-core/releases/tag/v${VERSION}
-Tag commit id: ${VERSION_COMMIT_ID}
+https://github.com/${REPO_SLUG}/releases/tag/${TAG}
+Tag commit id: ${SHA}
 
 The artifacts to be voted on are located as follows (r${DIST_SVN_REVISION}):
-Source release: https://dist.apache.org/repos/dist/dev/grails/core/${VERSION}/sources
-Binary distributions: https://dist.apache.org/repos/dist/dev/grails/core/${VERSION}/distribution
+Source release: https://dist.apache.org/repos/dist/dev/${SVN_PROJECT}/${SVN_FOLDER}/${VERSION}/sources
+Binary distributions: https://dist.apache.org/repos/dist/dev/${SVN_PROJECT}/${SVN_FOLDER}/${VERSION}/distribution
 
 Release artifacts are signed with a key from the following file:
 https://dist.apache.org/repos/dist/release/grails/KEYS
 
-Please vote on releasing this package as: Apache Grails ${VERSION}.
+Please vote on releasing this package as: ${PROJECT_NAME} ${VERSION}.
 
 Reminder on ASF release approval requirements for PMC members:
 https://www.apache.org/legal/release-policy.html#release-approval
@@ -36,14 +36,14 @@ https://www.apache.org/info/verification.html
 
 Details of our release process are documented at: https://github.com/apache/grails-core/blob/HEAD/RELEASE.md
 
-As a reminder, most of our tools support an env `GRAILS_REPO_URL` so that the tools can be used from the staging location.  Set it to the staging repo like this: `export GRAILS_REPO_URL=https://repository.apache.org/content/groups/staging`
+As a reminder, most of our tools support an env `GRAILS_REPO_URL` so that the tools can work with staged artefacts. Set it to the staging repo like this: `export GRAILS_REPO_URL=https://repository.apache.org/content/groups/staging`
 
 The vote is open for a minimum of 72 hours and passes if a majority of at least
 three +1 PMC votes are cast.
 
-[ ] +1 Release Apache Grails ${VERSION}
+[ ] +1 Release ${PROJECT_NAME} ${VERSION}
 [ ]  0 I don't have a strong opinion about this, but I assume it's ok
-[ ] -1 Do not release Apache Grails ${VERSION} because...
+[ ] -1 Do not release ${PROJECT_NAME} ${VERSION} because...
 
 Here is my vote:
 

.github/vote_templates/vote_succeeded.txt

@@ -0,0 +1,12 @@
+The vote has passed with <X> +1 binding votes and <Y> +1 additional votes.
+
+<IF NEW EMAIL>
+Vote thread: <VOTE THREAD PERMALINK>
+</IF NEW EMAIL>
+
+I'll proceed with the release and announce it shortly.
+
+Thanks to everyone who participated in the vote!
+
+Regards
+<NAME>