Skip to content

Commit 17c5e03

Browse files
committed
verify using KEYS from dist.apache.org
1 parent 6cb48b7 commit 17c5e03

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

etc/bin/verify-jar-artifacts.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ PROJECT_NAME='grails-spring-security'
2424
RELEASE_TAG=$1
2525
DOWNLOAD_LOCATION="${2:-downloads}"
2626
DOWNLOAD_LOCATION=$(realpath "${DOWNLOAD_LOCATION}")
27+
CWD=$(pwd)
2728

2829
if [ -z "${RELEASE_TAG}" ]; then
2930
echo "Usage: $0 [release-tag] <optional download location>"
@@ -35,7 +36,6 @@ VERSION=${RELEASE_TAG#v}
3536
ARTIFACTS_FILE="${DOWNLOAD_LOCATION}/${PROJECT_NAME}/PUBLISHED_ARTIFACTS"
3637
CHECKSUMS_FILE="${DOWNLOAD_LOCATION}/${PROJECT_NAME}/CHECKSUMS"
3738
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
38-
CWD=$(pwd)
3939

4040
if [ ! -f "${ARTIFACTS_FILE}" ]; then
4141
echo "Required file ${ARTIFACTS_FILE} not found."
@@ -60,7 +60,7 @@ trap error ERR
6060
cd "${DOWNLOAD_LOCATION}"
6161

6262
echo "Importing GPG key to independent GPG home ..."
63-
gpg --homedir "${GRAILS_GPG_HOME}" --import "${SCRIPT_DIR}/../../KEYS"
63+
gpg --homedir "${GRAILS_GPG_HOME}" --import "${DOWNLOAD_LOCATION}/KEYS"
6464
echo "✅ GPG Key Imported"
6565

6666
REPO_BASE_URL="https://repository.apache.org/content/groups/staging"

etc/bin/verify-source-distribution.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ shasum -a 512 -c "apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.sha512"
5050
echo "✅ Checksum Verified"
5151

5252
echo "Importing GPG key to independent GPG home ..."
53-
gpg --homedir "${GRAILS_GPG_HOME}" --import "${SCRIPT_DIR}/../../KEYS"
53+
gpg --homedir "${GRAILS_GPG_HOME}" --import "${DOWNLOAD_LOCATION}/KEYS"
5454
echo "✅ GPG Key Imported"
5555

5656
echo "Verifying GPG signature..."

etc/bin/verify.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ cleanup() {
3838
}
3939
trap cleanup ERR
4040

41+
echo "Downloading KEYS file ..."
42+
curl -sSfLO "https://dist.apache.org/repos/dist/release/grails/KEYS"
43+
echo "✅ KEYS Downloaded"
44+
4145
echo "Downloading Artifacts ..."
4246
"${SCRIPT_DIR}/download-release-artifacts.sh" "${RELEASE_TAG}" "${DOWNLOAD_LOCATION}"
4347
echo "✅ Artifacts Downloaded"

0 commit comments

Comments
 (0)