Merge remote-tracking branch 'origin/1.0.0-rc1-next'
diff --git a/contrib/create-release-candidate.sh b/contrib/create-release-candidate.sh
index 8760cd3..65a1387 100755
--- a/contrib/create-release-candidate.sh
+++ b/contrib/create-release-candidate.sh
@@ -19,10 +19,10 @@
scriptname=$(basename "$0")
export tlpName=accumulo
export projName="${tlpName}2-maven-plugin"
-export projNameLong="Accumulo Maven Plugin"
+export projNameLong="Accumulo2 Maven Plugin"
export stagingRepoPrefix="https://repository.apache.org/content/repositories/orgapache$tlpName"
export srcQualifier="source-release"
-export relTestingUrl="https://$tlpName.apache.org/release-process/#test-a-$tlpName-release"
+export relTestingUrl="https://$tlpName.apache.org/contributor/verifying-release"
export tagPrefix="rel/$projName-"
# check for gpg2
@@ -130,16 +130,19 @@
Staging repo: $(green "$stagingRepoPrefix-$stagingrepo")
Source (official release artifact): $(green "$stagingRepoPrefix-$stagingrepo/org/apache/$tlpName/$projName/$ver/$projName-$ver-$srcQualifier.tar.gz")
-(Append ".sha1", ".md5", or ".asc" to download the signature/hash for a given artifact.)
-In addition to the tarball, and its signature, the following checksum
-file will be added to the dist/release SVN area after release:
-$(yellow "$projName-$ver-$srcQualifier.tar.gz.sha512") will contain:
-SHA512 ($(green "$projName-$ver-$srcQualifier.tar.gz")) = $(yellow "$srcSha")
+Append ".asc" to download the cryptographic signature for a given artifact.
+(You can also append ".sha1" or ".md5" instead in order to verify the checksums
+generated by Maven to verify the integrity of the Nexus repository staging area.)
Signing keys are available at https://www.apache.org/dist/$tlpName/KEYS
(Expected fingerprint: $(green "$fingerprint"))
+In addition to the tarball and its signature, the following checksum
+file will be added to the dist/release SVN area after release:
+$(yellow "$projName-$ver-$srcQualifier.tar.gz.sha512") will contain:
+SHA512 ($(green "$projName-$ver-$srcQualifier.tar.gz")) = $(yellow "$srcSha")
+
Release notes (in progress) can be found at: $(green "https://$tlpName.apache.org/release/$projName-$ver/")
Release testing instructions: $relTestingUrl
@@ -287,10 +290,10 @@
run git push -u origin "refs/heads/$nBranch" "refs/heads/$rcBranch"
} || red "Did not push branches; you'll need to perform this step manually."
- local numSrc; numSrc=$(find target/checkout/ -type f -name "$projName-$ver-source-release.tar.gz" | wc -l)
+ local numSrc; numSrc=$(find target/checkout/ -maxdepth 2 -type f -name "$projName-$ver-source-release.tar.gz" | wc -l)
shopt -s globstar
local srcSha; srcSha=""
- [[ $numSrc = "1" ]] && srcSha=$(sha512sum target/checkout/**/"$projName-$ver-source-release.tar.gz" | cut -f1 -d" ")
+ [[ $numSrc = "1" ]] && srcSha=$(sha512sum target/checkout/"$projName-$ver-source-release.tar.gz" | cut -f1 -d" ")
# continue to creating email notification
echo "$(red Running)" "$(yellow "$scriptname" --create-email "$ver" "$rc")"
diff --git a/pom.xml b/pom.xml
index 6e47c4e..c96b9bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<artifactId>accumulo2-maven-plugin</artifactId>
<version>1.0.1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
- <name>Apache Accumulo Maven Plugin</name>
+ <name>Apache Accumulo Maven Plugin for Accumulo2</name>
<description>An Apache Maven plugin for testing software against a test Apache Accumulo instance.</description>
<!-- this URL is where the site derived via the maven-site-plugin ends up,
not the generic site; currently not used -->
