You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by sb...@apache.org on 2025/10/05 18:54:13 UTC
(grails-core) branch chore/issue_15102 created (now 79af4c7c70)
This is an automated email from the ASF dual-hosted git repository.
sbglasius pushed a change to branch chore/issue_15102
in repository https://gitbox.apache.org/repos/asf/grails-core.git
at 79af4c7c70 Fix 15102 Removed traces of incubation and PPMC
This branch includes the following new commits:
new 79af4c7c70 Fix 15102 Removed traces of incubation and PPMC
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(grails-core) 01/01: Fix 15102 Removed traces of incubation and PPMC
Posted by sb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sbglasius pushed a commit to branch chore/issue_15102
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 79af4c7c70fc9cc58eb4eb0bdbbbc45491096a6a
Author: SΓΈren Berg Glasius <so...@glasius.dk>
AuthorDate: Sun Oct 5 19:06:41 2025 +0200
Fix 15102 Removed traces of incubation and PPMC
---
.github/release-drafter.yml | 4 -
.github/scripts/releaseDistributions.sh | 6 +-
.github/vote_templates/announce.txt | 4 +-
.github/vote_templates/groovy_pmc.txt | 14 ++--
.github/vote_templates/staged.txt | 18 ++---
.github/workflows/gradle.yml | 4 +-
.github/workflows/release-abort.yml | 2 +-
.github/workflows/release.yml | 96 +++++++++---------------
CODE_OF_CONDUCT.md | 2 +-
DISCLAIMER | 1 -
README.md | 2 +-
RELEASE.md | 65 ++++++++--------
SECURITY.md | 2 +-
etc/bin/download-release-artifacts.sh | 84 ++++++++++-----------
etc/bin/reset-verify.sh | 4 +-
etc/bin/verify-cli-distribution.sh | 12 +--
etc/bin/verify-keys.sh | 2 +-
etc/bin/verify-source-distribution.sh | 10 +--
etc/bin/verify-wrapper-distribution.sh | 12 +--
etc/bin/verify.sh | 8 +-
grails-forge/grails-cli/build.gradle | 10 +--
grails-forge/grails-forge-core/build.gradle | 2 +-
grails-profiles/base/build.gradle | 2 +-
grails-wrapper/build.gradle | 2 +-
grails-wrapper/distribution-artifacts/DISCLAIMER | 1 -
25 files changed, 168 insertions(+), 201 deletions(-)
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index d3662d99f4..20443bcbc0 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -140,10 +140,6 @@ version-resolver:
- 'type: patch'
default: patch
template: |
- ## Disclaimer: Release Created While Under Incubation
-
- Apache Grails is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Groovy Project. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the p [...]
-
## What's Changed
$CHANGES
diff --git a/.github/scripts/releaseDistributions.sh b/.github/scripts/releaseDistributions.sh
index d935db6ea6..77a435c0db 100755
--- a/.github/scripts/releaseDistributions.sh
+++ b/.github/scripts/releaseDistributions.sh
@@ -32,8 +32,8 @@ RELEASE_TAG="$1"
RELEASE_VERSION="${RELEASE_TAG#v}"
SVN_USER="$2"
SVN_PASS="$3"
-RELEASE_ROOT="https://dist.apache.org/repos/dist/release/incubator/grails/core"
-DEV_ROOT="https://dist.apache.org/repos/dist/dev/incubator/grails/core"
+RELEASE_ROOT="https://dist.apache.org/repos/dist/release/grails/core"
+DEV_ROOT="https://dist.apache.org/repos/dist/dev/grails/core"
if [[ -z "${RELEASE_TAG}" ]]; then
echo "β ERROR: Release Tag must not be empty." >&2
@@ -79,5 +79,5 @@ if svn_exists "${RELEASE_VERSION_URL}"; then
fi
echo "π Promoting ${DEV_VERSION_URL} -> ${RELEASE_VERSION_URL}"
-svn mv "${svn_flags[@]}" -m "Promote Apache Grails (incubating) ${RELEASE_VERSION} from dev to release" "${DEV_VERSION_URL}" "${RELEASE_VERSION_URL}"
+svn mv "${svn_flags[@]}" -m "Promote Apache Grails ${RELEASE_VERSION} from dev to release" "${DEV_VERSION_URL}" "${RELEASE_VERSION_URL}"
echo "β
Promoted"
diff --git a/.github/vote_templates/announce.txt b/.github/vote_templates/announce.txt
index 3d87281021..a805440017 100644
--- a/.github/vote_templates/announce.txt
+++ b/.github/vote_templates/announce.txt
@@ -1,4 +1,4 @@
-The Apache Grails (incubating) community is pleased to announce the release of Apache Grails (incubating) ${VERSION}.
+The Apache Grails community is pleased to announce the release of Apache Grails ${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.
@@ -20,4 +20,4 @@ Grails Resources:
- Mailing lists: https://grails.apache.org/community.html
Happy Coding,
-The Apache Grails (incubating) Team
+The Apache Grails Team
diff --git a/.github/vote_templates/groovy_pmc.txt b/.github/vote_templates/groovy_pmc.txt
index b205127d9c..411ec7d9b1 100644
--- a/.github/vote_templates/groovy_pmc.txt
+++ b/.github/vote_templates/groovy_pmc.txt
@@ -2,8 +2,6 @@ Hi Everyone,
The Apache Grails community has voted to approve the release of Apache Grails ${VERSION}.
-As the incubation host, we now kindly request the Groovy PMC to review & approve our ASF release.
-
Grails vote thread:
* <VOTE THREAD LINK>
@@ -14,13 +12,13 @@ The tag for this release is:
* (grails-core) https://github.com/apache/grails-core/releases/tag/v${VERSION}
The artifacts to be voted on are located as follows (r${DIST_SVN_REVISION}):
-Source release: https://dist.apache.org/repos/dist/dev/incubator/grails/core/${VERSION}/sources
-Binary distributions: https://dist.apache.org/repos/dist/dev/incubator/grails/core/${VERSION}/distribution
+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
Release artifacts are signed with a key from the following file:
-https://dist.apache.org/repos/dist/release/incubator/grails/KEYS
+https://dist.apache.org/repos/dist/release/grails/KEYS
-Please vote on releasing this package as Apache Grails (incubating) ${VERSION}.
+Please vote on releasing this package as Apache Grails ${VERSION}.
Hints on validating checksums/signatures (but replace md5sum with sha512sum):
https://www.apache.org/info/verification.html
@@ -28,6 +26,6 @@ https://www.apache.org/info/verification.html
Our release process, including verification steps, are documented here: https://github.com/apache/grails-core/blob/HEAD/RELEASE.md The last section of this document `Appendix: Verification from a Container` is likely relevant. For the differing artifacts, we have compared the decompiled classes to ensure they are as we expect to meet the ASF security team's requirements.
The vote for this release is open for a minimum of 72 hours.
-[ ] +1 Release Apache Grails (incubating) ${VERSION}
+[ ] +1 Release Apache Grails ${VERSION}
[ ] 0 I don't have a strong opinion about this, but I assume it's ok
-[ ] -1 Do not release Apache Grails (incubating) ${VERSION} because...
+[ ] -1 Do not release Apache Grails ${VERSION} because...
diff --git a/.github/vote_templates/staged.txt b/.github/vote_templates/staged.txt
index af21ff9f42..b8df2f9348 100644
--- a/.github/vote_templates/staged.txt
+++ b/.github/vote_templates/staged.txt
@@ -1,6 +1,6 @@
Hi Everyone,
-I am happy to start the VOTE thread for an Apache Grails (incubating) release of version ${VERSION}!
+I am happy to start the VOTE thread for an Apache Grails release of version ${VERSION}!
Please note the following build reproducibility issues for this release:
@@ -20,15 +20,15 @@ https://github.com/apache/grails-core/releases/tag/v${VERSION}
Tag commit id: ${VERSION_COMMIT_ID}
The artifacts to be voted on are located as follows (r${DIST_SVN_REVISION}):
-Source release: https://dist.apache.org/repos/dist/dev/incubator/grails/core/${VERSION}/sources
-Binary distributions: https://dist.apache.org/repos/dist/dev/incubator/grails/core/${VERSION}/distribution
+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
Release artifacts are signed with a key from the following file:
-https://dist.apache.org/repos/dist/release/incubator/grails/KEYS
+https://dist.apache.org/repos/dist/release/grails/KEYS
-Please vote on releasing this package as: Apache Grails (incubating) ${VERSION}.
+Please vote on releasing this package as: Apache Grails ${VERSION}.
-Reminder on ASF release approval requirements for PPMC members:
+Reminder on ASF release approval requirements for PMC members:
https://www.apache.org/legal/release-policy.html#release-approval
Hints on validating checksums/signatures (but replace md5sum with sha512sum):
@@ -39,11 +39,11 @@ Details of our release process are documented at: https://github.com/apache/grai
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`
The vote is open for a minimum of 72 hours and passes if a majority of at least
-three +1 PPMC votes are cast.
+three +1 PMC votes are cast.
-[ ] +1 Release Apache Grails (incubating) ${VERSION}
+[ ] +1 Release Apache Grails ${VERSION}
[ ] 0 I don't have a strong opinion about this, but I assume it's ok
-[ ] -1 Do not release Apache Grails (incubating) ${VERSION} because...
+[ ] -1 Do not release Apache Grails ${VERSION} because...
Here is my vote:
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 6a1fa73326..e25712a300 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -146,7 +146,7 @@ jobs:
if: ${{ matrix.java == '17' }}
uses: actions/upload-artifact@v4
with:
- name: 'apache-grails-SNAPSHOT-incubating-bin.zip'
+ name: 'apache-grails-SNAPSHOT-bin.zip'
include-hidden-files: true
path: grails-forge/tmp1/cli/**/*
if-no-files-found: 'error'
@@ -352,7 +352,7 @@ jobs:
- name: "π€ Upload Wrapper Zip to Workflow Summary Page"
uses: actions/upload-artifact@v4
with:
- name: apache-grails-wrapper-SNAPSHOT-incubating-bin
+ name: apache-grails-wrapper-SNAPSHOT-bin
path: tmp/wrapper
publishForge:
if: github.repository_owner == 'apache' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
diff --git a/.github/workflows/release-abort.yml b/.github/workflows/release-abort.yml
index 7661e7fdb1..7898fdf2a4 100644
--- a/.github/workflows/release-abort.yml
+++ b/.github/workflows/release-abort.yml
@@ -79,7 +79,7 @@ jobs:
export VERSION="${{ steps.release_version.outputs.value }}"
svnmucc --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive \
-m "Remove grails dev version $VERSION" \
- rm "https://dist.apache.org/repos/dist/dev/incubator/grails/core/$VERSION"
+ rm "https://dist.apache.org/repos/dist/dev/grails/core/$VERSION"
- name: "Cancel GitHub Actions"
continue-on-error: true
env:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index df479df03f..b297130545 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -118,42 +118,42 @@ jobs:
env:
GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
run: |
- gpg --default-key "${GPG_KEY_ID}" --batch --yes --pinentry-mode loopback --armor --detach-sign grails-wrapper/build/distributions/apache-grails-wrapper-${{ steps.release_version.outputs.value }}-incubating-bin.zip
+ gpg --default-key "${GPG_KEY_ID}" --batch --yes --pinentry-mode loopback --armor --detach-sign grails-wrapper/build/distributions/apache-grails-wrapper-${{ steps.release_version.outputs.value }}-bin.zip
- name: "π¦ Create wrapper checksum"
run: |
cd grails-wrapper/build/distributions
ls
- sha512sum apache-grails-wrapper-${{ steps.release_version.outputs.value }}-incubating-bin.zip > "apache-grails-wrapper-${{ steps.release_version.outputs.value }}-incubating-bin.zip.sha512"
+ sha512sum apache-grails-wrapper-${{ steps.release_version.outputs.value }}-bin.zip > "apache-grails-wrapper-${{ steps.release_version.outputs.value }}-bin.zip.sha512"
echo "Generated checksum for grails wrapper ZIP:"
- cat apache-grails-wrapper-${{ steps.release_version.outputs.value }}-incubating-bin.zip.sha512
+ cat apache-grails-wrapper-${{ steps.release_version.outputs.value }}-bin.zip.sha512
- name: "π€ Upload grails wrapper ZIP"
uses: softprops/action-gh-release@v2
with:
files: |
- grails-wrapper/build/distributions/apache-grails-wrapper-${{ steps.release_version.outputs.value }}-incubating-bin.zip
- grails-wrapper/build/distributions/apache-grails-wrapper-${{ steps.release_version.outputs.value }}-incubating-bin.zip.sha512
- grails-wrapper/build/distributions/apache-grails-wrapper-${{ steps.release_version.outputs.value }}-incubating-bin.zip.asc
+ grails-wrapper/build/distributions/apache-grails-wrapper-${{ steps.release_version.outputs.value }}-bin.zip
+ grails-wrapper/build/distributions/apache-grails-wrapper-${{ steps.release_version.outputs.value }}-bin.zip.sha512
+ grails-wrapper/build/distributions/apache-grails-wrapper-${{ steps.release_version.outputs.value }}-bin.zip.asc
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: "π Sign CLI ZIP"
env:
GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
run: |
- gpg --default-key "${GPG_KEY_ID}" --batch --yes --pinentry-mode loopback --armor --detach-sign grails-forge/grails-cli/build/distributions/apache-grails-${{ steps.release_version.outputs.value }}-incubating-bin.zip
+ gpg --default-key "${GPG_KEY_ID}" --batch --yes --pinentry-mode loopback --armor --detach-sign grails-forge/grails-cli/build/distributions/apache-grails-${{ steps.release_version.outputs.value }}-bin.zip
- name: "π¦ Create CLI checksum"
run: |
cd grails-forge/grails-cli/build/distributions
ls
- sha512sum apache-grails-${{ steps.release_version.outputs.value }}-incubating-bin.zip > "apache-grails-${{ steps.release_version.outputs.value }}-incubating-bin.zip.sha512"
+ sha512sum apache-grails-${{ steps.release_version.outputs.value }}-bin.zip > "apache-grails-${{ steps.release_version.outputs.value }}-bin.zip.sha512"
echo "Generated checksum for grails cli ZIP:"
- cat apache-grails-${{ steps.release_version.outputs.value }}-incubating-bin.zip.sha512
+ cat apache-grails-${{ steps.release_version.outputs.value }}-bin.zip.sha512
- name: "π€ Upload CLI ZIP"
uses: softprops/action-gh-release@v2
with:
files: |
- grails-forge/grails-cli/build/distributions/apache-grails-${{ steps.release_version.outputs.value }}-incubating-bin.zip
- grails-forge/grails-cli/build/distributions/apache-grails-${{ steps.release_version.outputs.value }}-incubating-bin.zip.sha512
- grails-forge/grails-cli/build/distributions/apache-grails-${{ steps.release_version.outputs.value }}-incubating-bin.zip.asc
+ grails-forge/grails-cli/build/distributions/apache-grails-${{ steps.release_version.outputs.value }}-bin.zip
+ grails-forge/grails-cli/build/distributions/apache-grails-${{ steps.release_version.outputs.value }}-bin.zip.sha512
+ grails-forge/grails-cli/build/distributions/apache-grails-${{ steps.release_version.outputs.value }}-bin.zip.asc
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: "Create Staging Repository"
@@ -316,7 +316,7 @@ jobs:
find . -depth \( -type f -o -type d \) -exec touch -d "@${SOURCE_DATE_EPOCH}" {} +
- name: "π¦ Create source distribution ZIP"
run: |
- zip -r "apache-grails-${{ needs.publish.outputs.release_version }}-incubating-src.zip" grails -x 'grails/.git/*' -x 'grails/.github/*'
+ zip -r "apache-grails-${{ needs.publish.outputs.release_version }}-src.zip" grails -x 'grails/.git/*' -x 'grails/.github/*'
- name: 'π Set up GPG'
run: |
echo "${{ secrets.GRAILS_GPG_KEY }}" | gpg --batch --import
@@ -327,18 +327,18 @@ jobs:
env:
GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
run: |
- gpg --default-key "${GPG_KEY_ID}" --batch --yes --pinentry-mode loopback --armor --detach-sign apache-grails-${{ needs.publish.outputs.release_version }}-incubating-src.zip
+ gpg --default-key "${GPG_KEY_ID}" --batch --yes --pinentry-mode loopback --armor --detach-sign apache-grails-${{ needs.publish.outputs.release_version }}-src.zip
- name: "π¦ Create source distribution checksum"
run: |
- sha512sum apache-grails-${{ needs.publish.outputs.release_version }}-incubating-src.zip > "apache-grails-${{ needs.publish.outputs.release_version }}-incubating-src.zip.sha512"
+ sha512sum apache-grails-${{ needs.publish.outputs.release_version }}-src.zip > "apache-grails-${{ needs.publish.outputs.release_version }}-src.zip.sha512"
- name: "π Upload ZIP and Signature to GitHub Release"
uses: softprops/action-gh-release@v2
with:
tag_name: v${{ needs.publish.outputs.release_version }}
files: |
- apache-grails-*-incubating-src.zip
- apache-grails-*-incubating-src.zip.sha512
- apache-grails-*-incubating-src.zip.asc
+ apache-grails-*-src.zip
+ apache-grails-*-src.zip.sha512
+ apache-grails-*-src.zip.asc
- name: "Remove CHECKSUMS.txt asset from release"
working-directory: "grails"
env:
@@ -378,29 +378,29 @@ jobs:
run: |
set -e
- if svn ls https://dist.apache.org/repos/dist/dev/incubator/grails --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive; then
+ if svn ls https://dist.apache.org/repos/dist/dev/grails --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive; then
echo "Dev Folder 'grails' already exists β skipping creation"
else
echo "Dev Folder 'grails' does not exist, creating"
svnmucc --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive \
- mkdir https://dist.apache.org/repos/dist/dev/incubator/grails \
+ mkdir https://dist.apache.org/repos/dist/dev/grails \
-m "Create 'grails' dev folder"
fi
- name: "Ensure grails core folder exists"
run: |
set -e
- if svn ls https://dist.apache.org/repos/dist/dev/incubator/grails/core --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive; then
+ if svn ls https://dist.apache.org/repos/dist/dev/grails/core --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive; then
echo "Dev Folder 'grails/core' already exists β skipping creation"
else
echo "Dev Folder 'grails/core' does not exist, creating"
svnmucc --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive \
- mkdir https://dist.apache.org/repos/dist/dev/incubator/grails/core \
+ mkdir https://dist.apache.org/repos/dist/dev/grails/core \
-m "Create 'grails' dev folder"
fi
- name: "Checkout dev repo"
run: |
- svn checkout --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive https://dist.apache.org/repos/dist/dev/incubator/grails/core dev-repo
+ svn checkout --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive https://dist.apache.org/repos/dist/dev/grails/core dev-repo
- name: "Remove existing dev version"
run: |
export VERSION="${{ needs.publish.outputs.release_version }}"
@@ -418,9 +418,9 @@ jobs:
cd dev-repo
mkdir -p $VERSION/sources
cd $VERSION/sources
- curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-grails-$VERSION-incubating-src.zip
- curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-grails-$VERSION-incubating-src.zip.sha512
- curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-grails-$VERSION-incubating-src.zip.asc
+ curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-grails-$VERSION-src.zip
+ curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-grails-$VERSION-src.zip.sha512
+ curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-grails-$VERSION-src.zip.asc
echo "Downloaded the following files:"
ls -l
- name: "Fetch binary distributions"
@@ -430,12 +430,12 @@ jobs:
cd dev-repo
mkdir -p $VERSION/distribution
cd $VERSION/distribution
- curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-grails-$VERSION-incubating-bin.zip
- curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-grails-$VERSION-incubating-bin.zip.sha512
- curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-grails-$VERSION-incubating-bin.zip.asc
- curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-grails-wrapper-$VERSION-incubating-bin.zip
- curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-grails-wrapper-$VERSION-incubating-bin.zip.sha512
- curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-grails-wrapper-$VERSION-incubating-bin.zip.asc
+ curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-grails-$VERSION-bin.zip
+ curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-grails-$VERSION-bin.zip.sha512
+ curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-grails-$VERSION-bin.zip.asc
+ curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-grails-wrapper-$VERSION-bin.zip
+ curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-grails-wrapper-$VERSION-bin.zip.sha512
+ curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-grails-wrapper-$VERSION-bin.zip.asc
echo "Downloaded the following files:"
ls -l
- name: "Upload distributions"
@@ -465,37 +465,21 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
ref: v${{ needs.publish.outputs.release_version }}
path: "grails-core"
- - name: 'Initial Vote Email'
+ - name: 'Grails Vote Email'
env:
VERSION: ${{ needs.publish.outputs.release_version }}
VERSION_COMMIT_ID: ${{ needs.publish.outputs.commit_hash }}
run: |
export DIST_SVN_REVISION=$(awk '/Last Changed Rev:/ {print $4}' dev-repo/DIST_SVN_REVISION.txt)
- echo "::group::Grails PPMC Vote Email"
+ echo "::group::Grails PMC Vote Email"
echo "*************************************************"
- echo "Subject: [VOTE] Release Apache Grails (incubating) ${VERSION}"
+ echo "Subject: [VOTE] Release Apache Grails ${VERSION}"
echo "*************************************************"
echo "Body:"
echo "*************************************************"
cat grails-core/.github/vote_templates/staged.txt | envsubst
echo "*************************************************"
echo "::endgroup::"
- - name: 'Groovy Vote Email'
- env:
- VERSION: ${{ needs.publish.outputs.release_version }}
- VERSION_COMMIT_ID: ${{ needs.publish.outputs.commit_hash }}
- run: |
- export DIST_SVN_REVISION=$(awk '/Last Changed Rev:/ {print $4}' dev-repo/DIST_SVN_REVISION.txt)
-
- echo "::group::Groovy PMC Vote Email"
- echo "*************************************************"
- echo "Subject: [VOTE] Approval of Apache Grails (incubating) ${VERSION} release by Groovy PMC"
- echo "*************************************************"
- echo "Body:"
- echo "*************************************************"
- cat grails-core/.github/vote_templates/groovy_pmc.txt | envsubst
- echo "*************************************************"
- echo "::endgroup::"
release:
environment: release
name: "VOTE SUCCEEDED - Release Artifacts"
@@ -506,12 +490,7 @@ jobs:
run: curl -s https://api.ipify.org
- name: "Setup SVN and Tools"
run: sudo apt-get install -y subversion subversion-tools tree gettext-base
- - name: "π³ Grails PPMC Vote Confirmation - MANUAL"
- run: |
- echo "::group::Manual Confirmation"
- echo "π This step is a placeholder that the vote confirmation on dev@grails.apache.org completed successfully."
- echo "::endgroup::"
- - name: "π³ Groovy PMC Vote Confirmation - MANUAL"
+ - name: "π³ Grails PMC Vote Confirmation - MANUAL"
run: |
echo "::group::Manual Confirmation"
echo "π This step is a placeholder that the vote confirmation on dev@grails.apache.org completed successfully."
@@ -531,7 +510,6 @@ jobs:
echo "::group::Manual ASF Reporter Update"
TODAY=$(date +"%Y-%m-%d")
echo "Check email & update https://reporter.apache.org to mark the release ${{ needs.publish.outputs.release_version }} as complete as of ${TODAY}"
- echo "Note: this is a place holder; currently this is not possible since Groovy sponsors us instead of the incubator PMC"
echo "::endgroup::"
- name: "β
Deploy grails-forge - MANUAL"
run: |
@@ -660,7 +638,7 @@ jobs:
echo "::group::Announcement Email"
echo "*************************************************"
- echo "Subject: [ANNOUNCE] Apache Grails (incubating) ${VERSION}"
+ echo "Subject: [ANNOUNCE] Apache Grails ${VERSION}"
echo "*************************************************"
echo "Body:"
echo "*************************************************"
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 329203e9ee..ce4c24bdda 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,6 +1,6 @@
# Code of Conduct
-Apache Grails (Incubating) follows the ASF [Code of
+Apache Grails follows the ASF [Code of
Conduct](https://www.apache.org/foundation/policies/conduct).
If you observe behavior that violates those rules please follow the
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index d5b62af3d1..0000000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1 +0,0 @@
-Apache Grails is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Groovy Project. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the pro [...]
\ No newline at end of file
diff --git a/README.md b/README.md
index b0e21a2424..4433a886f2 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-# Apache Grails (Incubating)
+# Apache Grails
[](https://docs.grails.org)
[](https://ge.grails.org/scans)
diff --git a/RELEASE.md b/RELEASE.md
index 3946c809f9..7269ed115d 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -61,11 +61,11 @@ During the staging step, we must create a source distribution & stage any binary
5. (no approval required) The `upload` job will:
* Download the source distribution
* Download the binary distributions (wrapper & grails clis)
- * upload the source distribution to https://dist.apache.org/repos/dist/dev/incubator/grails/core/VERSION/sources
- * upload the grails-wrapper binary distribution to https://dist.apache.org/repos/dist/incubator/dev/grails/core/VERSION/distribution
- * upload the grails binary distribution to https://dist.apache.org/repos/dist/incubator/dev/grails/core/VERSION/distribution (note: this is the sdkman artifact)
+ * upload the source distribution to https://dist.apache.org/repos/dist/dev/grails/core/VERSION/sources
+ * upload the grails-wrapper binary distribution to https://dist.apache.org/repos/dist/dev/grails/core/VERSION/distribution
+ * upload the grails binary distribution to https://dist.apache.org/repos/dist/dev/grails/core/VERSION/distribution (note: this is the sdkman artifact)
* upload a file containing the SVN revision for the uploaded artifacts
- * generate vote email templates for both the Grails PPMC and Groovy PMC
+ * generate vote email templates for the Grails PMC
## 2. Verifying Artifacts are Authentic
@@ -97,25 +97,25 @@ verify the one inside of the source distribution.
### Manual Verification: Download the Staged Artifacts
-Use `etc/bin/download-release-artifacts.sh` to download the staged artifacts. This script will download the source distribution, wrapper binary distribution, and sdkman binary distribution. The distribution should come from [https://dist.apache.org/repos/dist/dev/incubator/grails/core/version](https://dist.apache.org/repos/dist/dev/incubator/grails/core).
+Use `etc/bin/download-release-artifacts.sh` to download the staged artifacts. This script will download the source distribution, wrapper binary distribution, and sdkman binary distribution. The distribution should come from [https://dist.apache.org/repos/dist/dev/grails/core/version](https://dist.apache.org/repos/dist/dev/grails/core).
### Manual Verification: Source Distribution Verification
The following are the source distribution artifacts:
- * `apache-grails-<version>-incubating-src.zip` - the source distribution
- * `apache-grails-<version>-incubating-src.zip.asc` - the generated signature of the source distribution
- * `apache-grails-<version>-incubating-src.zip.sha512` - the checksum to verify the source distribution
+ * `apache-grails-<version>-src.zip` - the source distribution
+ * `apache-grails-<version>-src.zip.asc` - the generated signature of the source distribution
+ * `apache-grails-<version>-src.zip.sha512` - the checksum to verify the source distribution
Use `etc/bin/verify-source-distribution.sh` to verify the source distribution. This script performs the following:
Verifies the source distribution checksum via the command:
```bash
- shasum -a 512 -c apache-grails-<version>-incubating-src.zip.sha512
+ shasum -a 512 -c apache-grails-<version>-src.zip.sha512
```
Verifies the source distribution signature via the command:
```bash
- gpg --verify apache-grails-<version>-incubating-src.zip.asc apache-grails-<version>-incubating-src.zip
+ gpg --verify apache-grails-<version>-src.zip.asc apache-grails-<version>-src.zip
```
Extracts the zip file and verifies the contents:
@@ -165,20 +165,20 @@ Grails has 2 binary distributions:
#### Manual Verification: Verify Grails Wrapper Binary Distribution
The following are the Grails Wrapper distribution artifacts:
-* `apache-grails-wrapper-<version>-incubating-bin.zip` - the wrapper distribution
-* `apache-grails-wrapper-<version>-incubating-bin.zip.asc` - the generated signature of the wrapper distribution
-* `apache-grails-wrapper-<version>-incubating-bin.zip.sha512` - the checksum to verify the wrapper distribution
+* `apache-grails-wrapper-<version>-bin.zip` - the wrapper distribution
+* `apache-grails-wrapper-<version>-bin.zip.asc` - the generated signature of the wrapper distribution
+* `apache-grails-wrapper-<version>-bin.zip.sha512` - the checksum to verify the wrapper distribution
Use `etc/bin/verify-wrapper-distribution.sh` to verify the wrapper distribution. This script performs the following:
Verifies the wrapper distribution checksum via the command:
```bash
- shasum -a 512 -c apache-grails-wrapper-<version>-incubating-bin.zip.sha512
+ shasum -a 512 -c apache-grails-wrapper-<version>-bin.zip.sha512
```
Verifies the wrapper distribution signature via the command:
```bash
- gpg --verify apache-grails-wrapper-<version>-incubating-bin.zip.asc apache-grails-wrapper-<version>-incubating-bin.zip
+ gpg --verify apache-grails-wrapper-<version>-bin.zip.asc apache-grails-wrapper-<version>-bin.zip
```
Extracts the zip file and verifies the contents:
@@ -187,20 +187,20 @@ Extracts the zip file and verifies the contents:
#### Manual Verification: Verify Grails Delegating CLI Binary Distribution
The following are the Grails distribution artifacts:
-* `apache-grails-<version>-incubating-bin.zip` - the cli distribution that will be uploaded to sdkman
-* `apache-grails-<version>-incubating-bin.zip.asc` - the generated signature of the cli distribution
-* `apache-grails-<version>-incubating-bin.zip.sha512` - the checksum to verify the cli distribution
+* `apache-grails-<version>-bin.zip` - the cli distribution that will be uploaded to sdkman
+* `apache-grails-<version>-bin.zip.asc` - the generated signature of the cli distribution
+* `apache-grails-<version>-bin.zip.sha512` - the checksum to verify the cli distribution
Use `etc/bin/verify-cli-distribution.sh` to verify the cli distribution. This script performs the following:
Verifies the cli distribution checksum via the command:
```bash
- shasum -a 512 -c apache-grails-<version>-incubating-bin.zip.sha512
+ shasum -a 512 -c apache-grails-<version>-bin.zip.sha512
```
Verifies the cli distribution signature via the command:
```bash
- gpg --verify apache-grails-<version>-incubating-bin.zip.asc apache-grails-<version>-incubating-bin.zip
+ gpg --verify apache-grails-<version>-bin.zip.asc apache-grails-<version>-bin.zip
```
Extracts the zip file and verifies the contents:
@@ -241,21 +241,18 @@ example commands to perform this verification. However, it if manually verifying
## 4. Voting
-After all artifacts are uploaded, verified, and tested, we can vote on the release. As an ASF project, we follow the voting guidelines set forth by the [Apache Voting Process](https://www.apache.org/foundation/voting.html). We are also an incubating ASF software project, so there are 2 votes. Details for each follow:
+After all artifacts are uploaded, verified, and tested, we can vote on the release. As an ASF project, we follow the voting guidelines set forth by the [Apache Voting Process](https://www.apache.org/foundation/voting.html). We are also an ASF software project, so there are 2 votes. Details for each follow:
-### Apache Grails Incubating PPMC
+### Apache Grails PMC
-The first vote is conducted on the [Grails dev mailing list](https://lists.apache.org/list.html?dev@grails.apache.org).
-The only valid votes are those on the Apache Grails Incubating PPMC, but the community is welcome to participate to
-express their support. The vote template is generated as part of the release process. See the `upload` job in the
-`Release` workflow for the generated email.
+The release vote is conducted on
+the [Grails dev mailing list](https://lists.apache.org/list.html?dev@grails.apache.org).
+Only votes from members of the Apache Grails PMC are binding, but the community is welcome to participate to express
+their support.
-### Apache Groovy PMC
-
-As an incubating project under Apache Groovy, after a minimum of 72 hours and a successful Grails PPMC vote, the Groovy
-PMC must vote to approve the Apache Grails (incubating) release. This vote is held on
-the [Groovy dev mailing list](https://lists.apache.org/list.html?dev@groovy.apache.org). See the `upload` job in the
-`Release` workflow for the generated email.
+The vote runs for a minimum of 72 hours.
+The vote email is automatically generated as part of the release process β see the `upload` job in the `Release`
+workflow for details.
## 5. Releasing
@@ -265,7 +262,7 @@ way, the `release` job should be approved & reviewed before proceeding.
### Confirm Vote Passed
-Confirm the Grails PPMC & Groovy PMC votes passed with a +1 from at least 3 PPMC members. The `release` job in the
+Confirm the Grails PMC votes passed with a +1 from at least 3 PMC members. The `release` job in the
`Release` workflow will remind you of these steps.
### Release the Staged Jar files
@@ -359,7 +356,7 @@ This rollback will perform the following:
1. Drop the configured staging repository based on the release tag. (See `Appendix: Rollback a Nexus Artifacts (Jars)`
for how to do this separately from the abort workflow)
2. Remove the staged artifacts
- from [https://dist.apache.org/repos/dist/dev/incubator/grails/core](https://dist.apache.org/repos/dist/incubator/dev/grails/core)
+ from [https://dist.apache.org/repos/dist/dev/grails/core](https://dist.apache.org/repos/dist/dev/grails/core)
3. Cancel the GitHub Action `Release` (this may need to be manually cancelled depending on the workflow state)
4. Remove the GitHub Release from GitHub
5. Remove the Git tag
diff --git a/SECURITY.md b/SECURITY.md
index 0d4d3a3a2e..5000548d42 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -16,7 +16,7 @@ limitations under the License.
# Security Policy
-The Apache Grails (incubating) is committed to the continued innovation, development, maintenance, and support of the Grails framework.
+The Apache Grails is committed to the continued innovation, development, maintenance, and support of the Grails framework.
Our goal is to provide Grails framework users the support they need while maintaining as much focus as possible on innovation.
The level and type of support available for earlier versions of the Grails framework will change as the framework continues to evolve.
diff --git a/etc/bin/download-release-artifacts.sh b/etc/bin/download-release-artifacts.sh
index f61b02e0b7..696bd44b28 100755
--- a/etc/bin/download-release-artifacts.sh
+++ b/etc/bin/download-release-artifacts.sh
@@ -37,59 +37,59 @@ VERSION=${RELEASE_TAG#v}
# Source distro
echo "Downloading GitHub source release files"
-curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip"
-curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.asc" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.asc"
-curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.sha512" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.sha512"
+curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-src.zip" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-${VERSION}-src.zip"
+curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-src.zip.asc" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-${VERSION}-src.zip.asc"
+curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-src.zip.sha512" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-${VERSION}-src.zip.sha512"
echo "Downloading SVN source release files"
-curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip" "https://dist.apache.org/repos/dist/dev/incubator/grails/${SVN_FOLDER}/${VERSION}/sources/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip"
-curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.asc" "https://dist.apache.org/repos/dist/dev/incubator/grails/${SVN_FOLDER}/${VERSION}/sources/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.asc"
-curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.sha512" "https://dist.apache.org/repos/dist/dev/incubator/grails/${SVN_FOLDER}/${VERSION}/sources/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.sha512"
+curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-src.zip" "https://dist.apache.org/repos/dist/dev/grails/${SVN_FOLDER}/${VERSION}/sources/apache-${PROJECT_NAME}-${VERSION}-src.zip"
+curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-src.zip.asc" "https://dist.apache.org/repos/dist/dev/grails/${SVN_FOLDER}/${VERSION}/sources/apache-${PROJECT_NAME}-${VERSION}-src.zip.asc"
+curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-src.zip.sha512" "https://dist.apache.org/repos/dist/dev/grails/${SVN_FOLDER}/${VERSION}/sources/apache-${PROJECT_NAME}-${VERSION}-src.zip.sha512"
# wrapper
echo "Downloading GitHub wrapper release files"
-curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-wrapper-${VERSION}-incubating-bin.zip" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-wrapper-${VERSION}-incubating-bin.zip"
-curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-wrapper-${VERSION}-incubating-bin.zip.asc" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-wrapper-${VERSION}-incubating-bin.zip.asc"
-curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-wrapper-${VERSION}-incubating-bin.zip.sha512" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-wrapper-${VERSION}-incubating-bin.zip.sha512"
+curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-wrapper-${VERSION}-bin.zip" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-wrapper-${VERSION}-bin.zip"
+curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-wrapper-${VERSION}-bin.zip.asc" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-wrapper-${VERSION}-bin.zip.asc"
+curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-wrapper-${VERSION}-bin.zip.sha512" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-wrapper-${VERSION}-bin.zip.sha512"
echo "Downloading SVN wrapper release files"
-curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-wrapper-${VERSION}-incubating-bin.zip" "https://dist.apache.org/repos/dist/dev/incubator/grails/${SVN_FOLDER}/${VERSION}/distribution/apache-${PROJECT_NAME}-wrapper-${VERSION}-incubating-bin.zip"
-curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-wrapper-${VERSION}-incubating-bin.zip.asc" "https://dist.apache.org/repos/dist/dev/incubator/grails/${SVN_FOLDER}/${VERSION}/distribution/apache-${PROJECT_NAME}-wrapper-${VERSION}-incubating-bin.zip.asc"
-curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-wrapper-${VERSION}-incubating-bin.zip.sha512" "https://dist.apache.org/repos/dist/dev/incubator/grails/${SVN_FOLDER}/${VERSION}/distribution/apache-${PROJECT_NAME}-wrapper-${VERSION}-incubating-bin.zip.sha512"
+curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-wrapper-${VERSION}-bin.zip" "https://dist.apache.org/repos/dist/dev/grails/${SVN_FOLDER}/${VERSION}/distribution/apache-${PROJECT_NAME}-wrapper-${VERSION}-bin.zip"
+curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-wrapper-${VERSION}-bin.zip.asc" "https://dist.apache.org/repos/dist/dev/grails/${SVN_FOLDER}/${VERSION}/distribution/apache-${PROJECT_NAME}-wrapper-${VERSION}-bin.zip.asc"
+curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-wrapper-${VERSION}-bin.zip.sha512" "https://dist.apache.org/repos/dist/dev/grails/${SVN_FOLDER}/${VERSION}/distribution/apache-${PROJECT_NAME}-wrapper-${VERSION}-bin.zip.sha512"
# sdkman delegating cli
echo "Downloading GitHub cli release files"
-curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-incubating-bin.zip" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-${VERSION}-incubating-bin.zip"
-curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-incubating-bin.zip.asc" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-${VERSION}-incubating-bin.zip.asc"
-curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-incubating-bin.zip.sha512" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-${VERSION}-incubating-bin.zip.sha512"
+curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-bin.zip" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-${VERSION}-bin.zip"
+curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-bin.zip.asc" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-${VERSION}-bin.zip.asc"
+curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-bin.zip.sha512" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-${VERSION}-bin.zip.sha512"
echo "Downloading SVN wrapper release files"
-curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-incubating-bin.zip" "https://dist.apache.org/repos/dist/dev/incubator/grails/${SVN_FOLDER}/${VERSION}/distribution/apache-${PROJECT_NAME}-${VERSION}-incubating-bin.zip"
-curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-incubating-bin.zip.asc" "https://dist.apache.org/repos/dist/dev/incubator/grails/${SVN_FOLDER}/${VERSION}/distribution/apache-${PROJECT_NAME}-${VERSION}-incubating-bin.zip.asc"
-curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-incubating-bin.zip.sha512" "https://dist.apache.org/repos/dist/dev/incubator/grails/${SVN_FOLDER}/${VERSION}/distribution/apache-${PROJECT_NAME}-${VERSION}-incubating-bin.zip.sha512"
+curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-bin.zip" "https://dist.apache.org/repos/dist/dev/grails/${SVN_FOLDER}/${VERSION}/distribution/apache-${PROJECT_NAME}-${VERSION}-bin.zip"
+curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-bin.zip.asc" "https://dist.apache.org/repos/dist/dev/grails/${SVN_FOLDER}/${VERSION}/distribution/apache-${PROJECT_NAME}-${VERSION}-bin.zip.asc"
+curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-bin.zip.sha512" "https://dist.apache.org/repos/dist/dev/grails/${SVN_FOLDER}/${VERSION}/distribution/apache-${PROJECT_NAME}-${VERSION}-bin.zip.sha512"
# validate downloads
set +e
echo "Comparing SVN vs GitHub source release files"
-cmp -s "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.asc" "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.asc"
+cmp -s "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-src.zip.asc" "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-src.zip.asc"
if [ $? -eq 0 ]; then
- echo "β
Identical SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.asc"
+ echo "β
Identical SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-src.zip.asc"
else
- echo "βDifferent SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.asc"
+ echo "βDifferent SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-src.zip.asc"
exit 1
fi
-cmp -s "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.sha512" "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.sha512"
+cmp -s "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-src.zip.sha512" "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-src.zip.sha512"
if [ $? -eq 0 ]; then
- echo "β
Identical SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.sha512"
+ echo "β
Identical SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-src.zip.sha512"
else
- echo "β Different SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.sha512"
+ echo "β Different SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-src.zip.sha512"
exit 1
fi
-SRC_ZIP_SVN_CHECKSUM=$(shasum -a 512 "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip" | awk '{print $1}')
-SRC_ZIP_GITHUB_CHECKSUM=$(shasum -a 512 "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip" | awk '{print $1}')
+SRC_ZIP_SVN_CHECKSUM=$(shasum -a 512 "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-src.zip" | awk '{print $1}')
+SRC_ZIP_GITHUB_CHECKSUM=$(shasum -a 512 "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-src.zip" | awk '{print $1}')
if [ "${SRC_ZIP_SVN_CHECKSUM}" != "${SRC_ZIP_GITHUB_CHECKSUM}" ]; then
echo "β Checksum mismatch between SVN and GitHub source zip files"
exit 1
@@ -98,24 +98,24 @@ else
fi
echo "Comparing SVN vs GitHub wrapper release files"
-cmp -s "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-wrapper-${VERSION}-incubating-bin.zip.asc" "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-wrapper-${VERSION}-incubating-bin.zip.asc"
+cmp -s "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-wrapper-${VERSION}-bin.zip.asc" "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-wrapper-${VERSION}-bin.zip.asc"
if [ $? -eq 0 ]; then
- echo "β
Identical SVN vs GitHub Upload for apache-${PROJECT_NAME}-wrapper-${VERSION}-incubating-bin.zip.asc"
+ echo "β
Identical SVN vs GitHub Upload for apache-${PROJECT_NAME}-wrapper-${VERSION}-bin.zip.asc"
else
- echo "βDifferent SVN vs GitHub Upload for apache-${PROJECT_NAME}-wrapper-${VERSION}-incubating-bin.zip.asc"
+ echo "βDifferent SVN vs GitHub Upload for apache-${PROJECT_NAME}-wrapper-${VERSION}-bin.zip.asc"
exit 1
fi
-cmp -s "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-wrapper-${VERSION}-incubating-bin.zip.sha512" "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-wrapper-${VERSION}-incubating-bin.zip.sha512"
+cmp -s "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-wrapper-${VERSION}-bin.zip.sha512" "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-wrapper-${VERSION}-bin.zip.sha512"
if [ $? -eq 0 ]; then
- echo "β
Identical SVN vs GitHub Upload for apache-${PROJECT_NAME}-wrapper-${VERSION}-incubating-bin.zip.sha512"
+ echo "β
Identical SVN vs GitHub Upload for apache-${PROJECT_NAME}-wrapper-${VERSION}-bin.zip.sha512"
else
- echo "β Different SVN vs GitHub Upload for apache-${PROJECT_NAME}-wrapper-${VERSION}-incubating-bin.zip.sha512"
+ echo "β Different SVN vs GitHub Upload for apache-${PROJECT_NAME}-wrapper-${VERSION}-bin.zip.sha512"
exit 1
fi
-WRAPPER_ZIP_SVN_CHECKSUM=$(shasum -a 512 "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-wrapper-${VERSION}-incubating-bin.zip" | awk '{print $1}')
-WRAPPER_ZIP_GITHUB_CHECKSUM=$(shasum -a 512 "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-wrapper-${VERSION}-incubating-bin.zip" | awk '{print $1}')
+WRAPPER_ZIP_SVN_CHECKSUM=$(shasum -a 512 "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-wrapper-${VERSION}-bin.zip" | awk '{print $1}')
+WRAPPER_ZIP_GITHUB_CHECKSUM=$(shasum -a 512 "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-wrapper-${VERSION}-bin.zip" | awk '{print $1}')
if [ "${WRAPPER_ZIP_SVN_CHECKSUM}" != "${WRAPPER_ZIP_GITHUB_CHECKSUM}" ]; then
echo "β Checksum mismatch between SVN and GitHub wrapper zip files"
exit 1
@@ -124,24 +124,24 @@ else
fi
echo "Comparing SVN vs GitHub cli release files"
-cmp -s "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-incubating-bin.zip.asc" "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-incubating-bin.zip.asc"
+cmp -s "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-bin.zip.asc" "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-bin.zip.asc"
if [ $? -eq 0 ]; then
- echo "β
Identical SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-incubating-bin.zip.asc"
+ echo "β
Identical SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-bin.zip.asc"
else
- echo "βDifferent SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-incubating-bin.zip.asc"
+ echo "βDifferent SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-bin.zip.asc"
exit 1
fi
-cmp -s "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-incubating-bin.zip.sha512" "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-incubating-bin.zip.sha512"
+cmp -s "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-bin.zip.sha512" "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-bin.zip.sha512"
if [ $? -eq 0 ]; then
- echo "β
Identical SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-incubating-bin.zip.sha512"
+ echo "β
Identical SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-bin.zip.sha512"
else
- echo "β Different SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-incubating-bin.zip.sha512"
+ echo "β Different SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-bin.zip.sha512"
exit 1
fi
-CLI_ZIP_SVN_CHECKSUM=$(shasum -a 512 "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-incubating-bin.zip" | awk '{print $1}')
-CLI_ZIP_GITHUB_CHECKSUM=$(shasum -a 512 "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-incubating-bin.zip" | awk '{print $1}')
+CLI_ZIP_SVN_CHECKSUM=$(shasum -a 512 "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-bin.zip" | awk '{print $1}')
+CLI_ZIP_GITHUB_CHECKSUM=$(shasum -a 512 "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-bin.zip" | awk '{print $1}')
if [ "${CLI_ZIP_SVN_CHECKSUM}" != "${CLI_ZIP_GITHUB_CHECKSUM}" ]; then
echo "β Checksum mismatch between SVN and GitHub wrapper zip files"
exit 1
diff --git a/etc/bin/reset-verify.sh b/etc/bin/reset-verify.sh
index 4ee6cf3e77..9394df66a5 100755
--- a/etc/bin/reset-verify.sh
+++ b/etc/bin/reset-verify.sh
@@ -41,7 +41,7 @@ cd bin
find . -mindepth 1 -path ./results -prune -o -exec rm -rf {} +
cd "${CWD}"
-rm -rf "apache-grails-${VERSION}-incubating-bin"
-rm -rf "apache-grails-wrapper-${VERSION}-incubating-bin"
+rm -rf "apache-grails-${VERSION}-bin"
+rm -rf "apache-grails-wrapper-${VERSION}-bin"
rm -rf "profile-wrapper-check"
rm -f ./custom-repos.gradle
\ No newline at end of file
diff --git a/etc/bin/verify-cli-distribution.sh b/etc/bin/verify-cli-distribution.sh
index e883123958..2464c070b4 100755
--- a/etc/bin/verify-cli-distribution.sh
+++ b/etc/bin/verify-cli-distribution.sh
@@ -31,10 +31,10 @@ fi
VERSION=${RELEASE_TAG#v}
cd $DOWNLOAD_LOCATION
-ZIP_FILE=$(ls "apache-grails-${VERSION}-incubating-bin.zip" 2>/dev/null | head -n 1)
+ZIP_FILE=$(ls "apache-grails-${VERSION}-bin.zip" 2>/dev/null | head -n 1)
if [ -z "$ZIP_FILE" ]; then
- echo "Error: Could not find apache-grails-${VERSION}-incubating-bin.zip in $DOWNLOAD_LOCATION"
+ echo "Error: Could not find apache-grails-${VERSION}-bin.zip in $DOWNLOAD_LOCATION"
exit 1
fi
@@ -51,7 +51,7 @@ error() {
trap error ERR
echo "Verifying checksum..."
-shasum -a 512 -c "apache-grails-${VERSION}-incubating-bin.zip.sha512"
+shasum -a 512 -c "apache-grails-${VERSION}-bin.zip.sha512"
echo "β
Checksum Verified"
echo "Importing GPG key to independent GPG home ..."
@@ -59,13 +59,13 @@ gpg --homedir "${GRAILS_GPG_HOME}" --import "${SCRIPT_DIR}/../../KEYS"
echo "β
GPG Key Imported"
echo "Verifying GPG signature..."
-gpg --homedir "${GRAILS_GPG_HOME}" --verify "apache-grails-${VERSION}-incubating-bin.zip.asc" "apache-grails-${VERSION}-incubating-bin.zip"
+gpg --homedir "${GRAILS_GPG_HOME}" --verify "apache-grails-${VERSION}-bin.zip.asc" "apache-grails-${VERSION}-bin.zip"
echo "β
GPG Verified"
-SRC_DIR="apache-grails-${VERSION}-incubating-bin"
+SRC_DIR="apache-grails-${VERSION}-bin"
rm -rf "${SRC_DIR}" || true
echo "Extracting zip file..."
-unzip -q "apache-grails-${VERSION}-incubating-bin.zip"
+unzip -q "apache-grails-${VERSION}-bin.zip"
if [ ! -d "${SRC_DIR}" ]; then
echo "Error: Expected extracted folder '${SRC_DIR}' not found."
diff --git a/etc/bin/verify-keys.sh b/etc/bin/verify-keys.sh
index 2ec43bd2ef..3990662be7 100755
--- a/etc/bin/verify-keys.sh
+++ b/etc/bin/verify-keys.sh
@@ -25,7 +25,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
mkdir -p "${DOWNLOAD_LOCATION}"
echo "Downloading KEYS file ..."
-curl -f -L -o "${DOWNLOAD_LOCATION}/SVN_KEYS" "https://dist.apache.org/repos/dist/release/incubator/grails/KEYS"
+curl -f -L -o "${DOWNLOAD_LOCATION}/SVN_KEYS" "https://dist.apache.org/repos/dist/release/grails/KEYS"
echo "β
KEYS Downloaded"
echo "Comparing checked in KEYS file with SVN KEYS file"
diff --git a/etc/bin/verify-source-distribution.sh b/etc/bin/verify-source-distribution.sh
index 3bc994d858..a883acab42 100755
--- a/etc/bin/verify-source-distribution.sh
+++ b/etc/bin/verify-source-distribution.sh
@@ -31,10 +31,10 @@ fi
VERSION=${RELEASE_TAG#v}
cd "${DOWNLOAD_LOCATION}"
-ZIP_FILE=$(ls "apache-grails-${VERSION}-incubating-src.zip" 2>/dev/null | head -n 1)
+ZIP_FILE=$(ls "apache-grails-${VERSION}-src.zip" 2>/dev/null | head -n 1)
if [ -z "${ZIP_FILE}" ]; then
- echo "Error: Could not find apache-grails-${VERSION}-incubating-src.zip in ${DOWNLOAD_LOCATION}"
+ echo "Error: Could not find apache-grails-${VERSION}-src.zip in ${DOWNLOAD_LOCATION}"
exit 1
fi
@@ -45,7 +45,7 @@ cleanup() {
trap cleanup EXIT
echo "Verifying checksum..."
-shasum -a 512 -c "apache-grails-${VERSION}-incubating-src.zip.sha512"
+shasum -a 512 -c "apache-grails-${VERSION}-src.zip.sha512"
echo "β
Checksum Verified"
echo "Importing GPG key to independent GPG home ..."
@@ -53,7 +53,7 @@ gpg --homedir "${GRAILS_GPG_HOME}" --import "${SCRIPT_DIR}/../../KEYS"
echo "β
GPG Key Imported"
echo "Verifying GPG signature..."
-gpg --homedir "${GRAILS_GPG_HOME}" --verify "apache-grails-${VERSION}-incubating-src.zip.asc" "apache-grails-${VERSION}-incubating-src.zip"
+gpg --homedir "${GRAILS_GPG_HOME}" --verify "apache-grails-${VERSION}-src.zip.asc" "apache-grails-${VERSION}-src.zip"
echo "β
GPG Verified"
SRC_DIR="grails"
@@ -69,7 +69,7 @@ if [ -d "${SRC_DIR}" ]; then
cd "${DOWNLOAD_LOCATION}"
fi
echo "Extracting zip file..."
-unzip -q "apache-grails-${VERSION}-incubating-src.zip"
+unzip -q "apache-grails-${VERSION}-src.zip"
if [ ! -d "${SRC_DIR}" ]; then
echo "Error: Expected extracted folder '${SRC_DIR}' not found."
diff --git a/etc/bin/verify-wrapper-distribution.sh b/etc/bin/verify-wrapper-distribution.sh
index a1b90acb6d..6b9a547608 100755
--- a/etc/bin/verify-wrapper-distribution.sh
+++ b/etc/bin/verify-wrapper-distribution.sh
@@ -31,10 +31,10 @@ fi
VERSION=${RELEASE_TAG#v}
cd $DOWNLOAD_LOCATION
-ZIP_FILE=$(ls "apache-grails-wrapper-${VERSION}-incubating-bin.zip" 2>/dev/null | head -n 1)
+ZIP_FILE=$(ls "apache-grails-wrapper-${VERSION}-bin.zip" 2>/dev/null | head -n 1)
if [ -z "$ZIP_FILE" ]; then
- echo "Error: Could not find apache-grails-wrapper-${VERSION}-incubating-bin.zip in $DOWNLOAD_LOCATION"
+ echo "Error: Could not find apache-grails-wrapper-${VERSION}-bin.zip in $DOWNLOAD_LOCATION"
exit 1
fi
@@ -50,7 +50,7 @@ error() {
trap cleanup ERR
echo "Verifying checksum..."
-shasum -a 512 -c "apache-grails-wrapper-${VERSION}-incubating-bin.zip.sha512"
+shasum -a 512 -c "apache-grails-wrapper-${VERSION}-bin.zip.sha512"
echo "β
Checksum Verified"
echo "Importing GPG key to independent GPG home ..."
@@ -58,13 +58,13 @@ gpg --homedir "${GRAILS_GPG_HOME}" --import "${SCRIPT_DIR}/../../KEYS"
echo "β
GPG Key Imported"
echo "Verifying GPG signature..."
-gpg --homedir "${GRAILS_GPG_HOME}" --verify "apache-grails-wrapper-${VERSION}-incubating-bin.zip.asc" "apache-grails-wrapper-${VERSION}-incubating-bin.zip"
+gpg --homedir "${GRAILS_GPG_HOME}" --verify "apache-grails-wrapper-${VERSION}-bin.zip.asc" "apache-grails-wrapper-${VERSION}-bin.zip"
echo "β
GPG Verified"
-SRC_DIR="apache-grails-wrapper-${VERSION}-incubating-bin"
+SRC_DIR="apache-grails-wrapper-${VERSION}-bin"
rm -rf "${SRC_DIR}" || true
echo "Extracting zip file..."
-unzip -q "apache-grails-wrapper-${VERSION}-incubating-bin.zip"
+unzip -q "apache-grails-wrapper-${VERSION}-bin.zip"
if [ ! -d "${SRC_DIR}" ]; then
echo "Error: Expected extracted folder '${SRC_DIR}' not found."
diff --git a/etc/bin/verify.sh b/etc/bin/verify.sh
index d40bf8393c..ddd63ecaaa 100755
--- a/etc/bin/verify.sh
+++ b/etc/bin/verify.sh
@@ -115,10 +115,10 @@ echo "β
Reproducible Build Verified"
echo "Be sure to do the following:"
echo "βοΈ Set the override repo: 'export GRAILS_REPO_URL=https://repository.apache.org/content/groups/staging' "
-echo "βοΈ Run the wrapper ShellApp: cd ${DOWNLOAD_LOCATION}/apache-grails-wrapper-${VERSION}-incubating-bin/ShellApp && ./gradlew bootRun --init-script ~/grails-verify/custom-repos.gradle"
-echo "βοΈ Run the wrapper ForgeApp: cd ${DOWNLOAD_LOCATION}/apache-grails-wrapper-${VERSION}-incubating-bin/ForgeApp && ./gradlew bootRun --init-script ~/grails-verify/custom-repos.gradle"
-echo "βοΈ Run the cli ShellApp: cd ${DOWNLOAD_LOCATION}/apache-grails-${VERSION}-incubating-bin/bin/ShellApp && ./gradlew bootRun --init-script ~/grails-verify/custom-repos.gradle"
-echo "βοΈ Run the cli ForgeApp: cd ${DOWNLOAD_LOCATION}/apache-grails-${VERSION}-incubating-bin/bin/ForgeApp && ./gradlew bootRun --init-script ~/grails-verify/custom-repos.gradle"
+echo "βοΈ Run the wrapper ShellApp: cd ${DOWNLOAD_LOCATION}/apache-grails-wrapper-${VERSION}-bin/ShellApp && ./gradlew bootRun --init-script ~/grails-verify/custom-repos.gradle"
+echo "βοΈ Run the wrapper ForgeApp: cd ${DOWNLOAD_LOCATION}/apache-grails-wrapper-${VERSION}-bin/ForgeApp && ./gradlew bootRun --init-script ~/grails-verify/custom-repos.gradle"
+echo "βοΈ Run the cli ShellApp: cd ${DOWNLOAD_LOCATION}/apache-grails-${VERSION}-bin/bin/ShellApp && ./gradlew bootRun --init-script ~/grails-verify/custom-repos.gradle"
+echo "βοΈ Run the cli ForgeApp: cd ${DOWNLOAD_LOCATION}/apache-grails-${VERSION}-bin/bin/ForgeApp && ./gradlew bootRun --init-script ~/grails-verify/custom-repos.gradle"
echo "βοΈ Add the local repos to the application and then run the shell cli from one of the applications and ensure all commands show as expected - pay attention to the scaffolding ones since they are dynamically loaded"
echo "β
β
β
Verification finished, see above instructions for remaining manual testing."
\ No newline at end of file
diff --git a/grails-forge/grails-cli/build.gradle b/grails-forge/grails-cli/build.gradle
index 21e14b1327..9b0ffdc78a 100644
--- a/grails-forge/grails-cli/build.gradle
+++ b/grails-forge/grails-cli/build.gradle
@@ -159,7 +159,7 @@ forgeCliStartScripts.configure { CreateStartScripts t ->
project.extensions.getByType(DistributionContainer).configureEach {
it.distributionBaseName.set('apache-grails')
- it.distributionClassifier.set('incubating-bin')
+ it.distributionClassifier.set('bin')
it.contents {
from(shadowJarTask) {
into "lib"
@@ -225,9 +225,9 @@ sdkman {
version = project.version
hashtag = '#grailsfw'
platforms = [
- 'MAC_ARM64' : "https://github.com/apache/grails-core/releases/download/v${project.version}/apache-grails-${project.version}-incubating-bin.zip",
- 'MAC_OSX' : "https://github.com/apache/grails-core/releases/download/v${project.version}/apache-grails-${project.version}-incubating-bin.zip",
- 'WINDOWS_64': "https://github.com/apache/grails-core/releases/download/v${project.version}/apache-grails-${project.version}-incubating-bin.zip",
- 'LINUX_64' : "https://github.com/apache/grails-core/releases/download/v${project.version}/apache-grails-${project.version}-incubating-bin.zip"
+ 'MAC_ARM64' : "https://github.com/apache/grails-core/releases/download/v${project.version}/apache-grails-${project.version}-bin.zip",
+ 'MAC_OSX' : "https://github.com/apache/grails-core/releases/download/v${project.version}/apache-grails-${project.version}-bin.zip",
+ 'WINDOWS_64': "https://github.com/apache/grails-core/releases/download/v${project.version}/apache-grails-${project.version}-bin.zip",
+ 'LINUX_64' : "https://github.com/apache/grails-core/releases/download/v${project.version}/apache-grails-${project.version}-bin.zip"
] as Map<? extends String, ? extends String>
}
\ No newline at end of file
diff --git a/grails-forge/grails-forge-core/build.gradle b/grails-forge/grails-forge-core/build.gradle
index 2c68db26b3..80136f69c1 100644
--- a/grails-forge/grails-forge-core/build.gradle
+++ b/grails-forge/grails-forge-core/build.gradle
@@ -98,7 +98,7 @@ TaskProvider<Sync> copyGrailsWrapper = tasks.register('copyGrailsWrapper', Sync)
copyGrailsWrapper.configure { Sync it ->
it.dependsOn(gradle.includedBuild('grails-core').task(':grails-wrapper:installDist'))
- def wrapperFiles = rootProject.layout.projectDirectory.dir('../grails-wrapper/build/install/apache-grails-wrapper-incubating-bin')
+ def wrapperFiles = rootProject.layout.projectDirectory.dir('../grails-wrapper/build/install/apache-grails-wrapper-bin')
it.inputs.files(wrapperFiles)
it.includeEmptyDirs = false
diff --git a/grails-profiles/base/build.gradle b/grails-profiles/base/build.gradle
index c8139b9999..1d86b28cbf 100644
--- a/grails-profiles/base/build.gradle
+++ b/grails-profiles/base/build.gradle
@@ -38,7 +38,7 @@ TaskProvider<Copy> copyWrapper = tasks.register('copyGrailsWrapperScripts', Copy
copyWrapper.configure { Copy copy ->
Project wrapperProject = rootProject.project(':grails-wrapper')
copy.dependsOn(wrapperProject.tasks.named('installDist'))
- copy.from(wrapperProject.layout.buildDirectory.dir('install/apache-grails-wrapper-incubating-bin')) {
+ copy.from(wrapperProject.layout.buildDirectory.dir('install/apache-grails-wrapper-bin')) {
include '**/grails-wrapper.jar'
include '**/grailsw.bat'
include '**/grailsw'
diff --git a/grails-wrapper/build.gradle b/grails-wrapper/build.gradle
index 48407350d7..3b770d566b 100644
--- a/grails-wrapper/build.gradle
+++ b/grails-wrapper/build.gradle
@@ -94,7 +94,7 @@ startScripts.configure { CreateStartScripts t ->
project.extensions.getByType(DistributionContainer).configureEach {
// WARNING: changing the distro name / classifier requires updating the task in grails-profiles-base to copy from the correct location
it.distributionBaseName = 'apache-grails-wrapper'
- it.distributionClassifier = 'incubating-bin'
+ it.distributionClassifier = 'bin'
it.contents {
from(jarTask) {
into ''
diff --git a/grails-wrapper/distribution-artifacts/DISCLAIMER b/grails-wrapper/distribution-artifacts/DISCLAIMER
deleted file mode 100644
index d5b62af3d1..0000000000
--- a/grails-wrapper/distribution-artifacts/DISCLAIMER
+++ /dev/null
@@ -1 +0,0 @@
-Apache Grails is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Groovy Project. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the pro [...]
\ No newline at end of file