Skip to content

Commit 8db22f4

Browse files
committed
Removed traces of incubation, DISCLAIMER and PPMC
Fixes #1174
1 parent ae5942a commit 8db22f4

12 files changed

Lines changed: 55 additions & 112 deletions

.github/release-drafter.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,6 @@ version-resolver:
132132
- 'type: patch'
133133
default: patch
134134
template: |
135-
## Disclaimer: Release Created While Under Incubation
136-
137-
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 project has yet to be fully endorsed by the ASF.
138-
139135
## What's Changed
140136
141137
$CHANGES

.github/scripts/releaseDistributions.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ RELEASE_TAG="$1"
3232
RELEASE_VERSION="${RELEASE_TAG#v}"
3333
SVN_USER="$2"
3434
SVN_PASS="$3"
35-
RELEASE_ROOT="https://dist.apache.org/repos/dist/release/incubator/grails/spring-security"
36-
DEV_ROOT="https://dist.apache.org/repos/dist/dev/incubator/grails/spring-security"
35+
RELEASE_ROOT="https://dist.apache.org/repos/dist/release/grails/spring-security"
36+
DEV_ROOT="https://dist.apache.org/repos/dist/dev/grails/spring-security"
3737

3838
if [[ -z "${RELEASE_TAG}" ]]; then
3939
echo "❌ ERROR: Release Tag must not be empty." >&2
@@ -79,5 +79,5 @@ if svn_exists "${RELEASE_VERSION_URL}"; then
7979
fi
8080

8181
echo "🚀 Promoting ${DEV_VERSION_URL} -> ${RELEASE_VERSION_URL}"
82-
svn mv "${svn_flags[@]}" -m "Promote Apache Grails (incubating) ${RELEASE_VERSION} from dev to release" "${DEV_VERSION_URL}" "${RELEASE_VERSION_URL}"
82+
svn mv "${svn_flags[@]}" -m "Promote Apache Grails ${RELEASE_VERSION} from dev to release" "${DEV_VERSION_URL}" "${RELEASE_VERSION_URL}"
8383
echo "✅ Promoted"

.github/vote_templates/announce.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
The Apache Grails (incubating) community is pleased to announce the release of Apache Grails (incubating) Spring Security Plugin ${VERSION}.
1+
The Apache Grails community is pleased to announce the release of Apache Grails Spring Security Plugin ${VERSION}.
22

33
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.
44

@@ -17,4 +17,4 @@ Grails Resources:
1717
- Mailing lists: https://grails.apache.org/community.html
1818

1919
Happy Coding,
20-
The Apache Grails (incubating) Team
20+
The Apache Grails Team

.github/vote_templates/groovy_pmc.txt

Lines changed: 0 additions & 30 deletions
This file was deleted.

.github/vote_templates/staged.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Hi Everyone,
22

3-
I am happy to start the VOTE thread for an Apache Grails (incubating) Spring Security Plugin release of version ${VERSION}!
3+
I am happy to start the VOTE thread for an Apache Grails Spring Security Plugin release of version ${VERSION}!
44

55
Release notes for the release are here:
66
https://github.com/apache/grails-spring-security/releases/tag/v${VERSION}
@@ -10,25 +10,25 @@ https://github.com/apache/grails-spring-security/releases/tag/v${VERSION}
1010
Tag commit id: ${VERSION_COMMIT_ID}
1111

1212
The artifacts to be voted on are located as follows (r${DIST_SVN_REVISION}):
13-
Source release: https://dist.apache.org/repos/dist/dev/incubator/grails/spring-security/${VERSION}/sources
13+
Source release: https://dist.apache.org/repos/dist/dev/grails/spring-security/${VERSION}/sources
1414

1515
Release artifacts are signed with a key from the following file:
16-
https://dist.apache.org/repos/dist/release/incubator/grails/KEYS
16+
https://dist.apache.org/repos/dist/release/grails/KEYS
1717

18-
Please vote on releasing this package as: Apache Grails (incubating) Spring Security Plugin ${VERSION}.
18+
Please vote on releasing this package as: Apache Grails Spring Security Plugin ${VERSION}.
1919

20-
Reminder on ASF release approval requirements for PPMC members:
20+
Reminder on ASF release approval requirements for PMC members:
2121
https://www.apache.org/legal/release-policy.html#release-approval
2222

2323
Hints on validating checksums/signatures (but replace md5sum with sha512sum):
2424
https://www.apache.org/info/verification.html
2525

2626
The vote is open for a minimum of 72 hours and passes if a majority of at least
27-
three +1 PPMC votes are cast.
27+
three +1 PMC votes are cast.
2828

29-
[ ] +1 Release Apache Grails (incubating) Spring Security Plugin ${VERSION}
29+
[ ] +1 Release Apache Grails Spring Security Plugin ${VERSION}
3030
[ ] 0 I don't have a strong opinion about this, but I assume it's ok
31-
[ ] -1 Do not release Apache Grails (incubating) Spring Security Plugin ${VERSION} because...
31+
[ ] -1 Do not release Apache Grails Spring Security Plugin ${VERSION} because...
3232

3333
Here is my vote:
3434

.github/workflows/release-abort.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
export VERSION="${{ steps.release_version.outputs.value }}"
8080
svnmucc --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive \
8181
-m "Remove grails dev version $VERSION" \
82-
rm "https://dist.apache.org/repos/dist/dev/incubator/grails/spring-security/$VERSION"
82+
rm "https://dist.apache.org/repos/dist/dev/grails/spring-security/$VERSION"
8383
- name: "Cancel GitHub Actions"
8484
continue-on-error: true
8585
env:

.github/workflows/release.yml

Lines changed: 19 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ jobs:
178178
find . -depth \( -type f -o -type d \) -exec touch -d "@${SOURCE_DATE_EPOCH}" {} +
179179
- name: "📦 Create source distribution ZIP"
180180
run: |
181-
zip -r "apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-incubating-src.zip" ${{ needs.publish.outputs.extract_repository_name }} -x '${{ needs.publish.outputs.extract_repository_name }}/.git/*' -x '${{ needs.publish.outputs.extract_repository_name }}/.github/*'
181+
zip -r "apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-src.zip" ${{ needs.publish.outputs.extract_repository_name }} -x '${{ needs.publish.outputs.extract_repository_name }}/.git/*' -x '${{ needs.publish.outputs.extract_repository_name }}/.github/*'
182182
- name: '🔐 Set up GPG'
183183
run: |
184184
echo "${{ secrets.GRAILS_GPG_KEY }}" | gpg --batch --import
@@ -189,19 +189,19 @@ jobs:
189189
env:
190190
GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
191191
run: |
192-
gpg --default-key "${GPG_KEY_ID}" --batch --yes --pinentry-mode loopback --armor --detach-sign ./apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-incubating-src.zip
192+
gpg --default-key "${GPG_KEY_ID}" --batch --yes --pinentry-mode loopback --armor --detach-sign ./apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-src.zip
193193
- name: "📦 Create source distribution checksum"
194194
run: |
195-
sha512sum ./apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-incubating-src.zip > "apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-incubating-src.zip.sha512"
196-
cat ./apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-incubating-src.zip.sha512
195+
sha512sum ./apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-src.zip > "apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-src.zip.sha512"
196+
cat ./apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-src.zip.sha512
197197
- name: "🚀 Upload ZIP and Signature to GitHub Release"
198198
uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631
199199
with:
200200
tag_name: v${{ needs.publish.outputs.release_version }}
201201
files: |
202-
apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-incubating-src.zip
203-
apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-incubating-src.zip.sha512
204-
apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-incubating-src.zip.asc
202+
apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-src.zip
203+
apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-src.zip.sha512
204+
apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-src.zip.asc
205205
- name: "🗑️ Remove CHECKSUMS.txt asset from release"
206206
working-directory: '${{ needs.publish.outputs.extract_repository_name }}'
207207
env:
@@ -253,29 +253,29 @@ jobs:
253253
run: |
254254
set -e
255255
256-
if svn ls https://dist.apache.org/repos/dist/dev/incubator/grails --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive; then
256+
if svn ls https://dist.apache.org/repos/dist/dev/grails --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive; then
257257
echo "Dev Folder 'grails' already exists — skipping creation"
258258
else
259259
echo "Dev Folder 'grails' does not exist, creating"
260260
svnmucc --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive \
261-
mkdir https://dist.apache.org/repos/dist/dev/incubator/grails \
261+
mkdir https://dist.apache.org/repos/dist/dev/grails \
262262
-m "Create 'grails' dev folder"
263263
fi
264264
- name: "👀 Ensure grails spring-security folder exists"
265265
run: |
266266
set -e
267267
268-
if svn ls https://dist.apache.org/repos/dist/dev/incubator/grails/spring-security --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive; then
268+
if svn ls https://dist.apache.org/repos/dist/dev/grails/spring-security --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive; then
269269
echo "Dev Folder 'grails/spring-security' already exists — skipping creation"
270270
else
271271
echo "Dev Folder 'grails/spring-security' does not exist, creating"
272272
svnmucc --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive \
273-
mkdir https://dist.apache.org/repos/dist/dev/incubator/grails/spring-security \
273+
mkdir https://dist.apache.org/repos/dist/dev/grails/spring-security \
274274
-m "Create 'grails spring-security' dev folder"
275275
fi
276276
- name: "📥 Checkout dev repo"
277277
run: |
278-
svn checkout --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive https://dist.apache.org/repos/dist/dev/incubator/grails/spring-security dev-repo
278+
svn checkout --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive https://dist.apache.org/repos/dist/dev/grails/spring-security dev-repo
279279
- name: "🗑️ Remove existing dev version"
280280
run: |
281281
export VERSION="${{ needs.publish.outputs.release_version }}"
@@ -293,9 +293,9 @@ jobs:
293293
cd dev-repo
294294
mkdir -p $VERSION/sources
295295
cd $VERSION/sources
296-
curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-${{ needs.publish.outputs.extract_repository_name }}-$VERSION-incubating-src.zip
297-
curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-${{ needs.publish.outputs.extract_repository_name }}-$VERSION-incubating-src.zip.sha512
298-
curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-${{ needs.publish.outputs.extract_repository_name }}-$VERSION-incubating-src.zip.asc
296+
curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-${{ needs.publish.outputs.extract_repository_name }}-$VERSION-src.zip
297+
curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-${{ needs.publish.outputs.extract_repository_name }}-$VERSION-src.zip.sha512
298+
curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-${{ needs.publish.outputs.extract_repository_name }}-$VERSION-src.zip.asc
299299
echo "Downloaded the following files:"
300300
ls -l
301301
- name: "Upload distributions"
@@ -332,31 +332,15 @@ jobs:
332332
run: |
333333
export DIST_SVN_REVISION=$(awk '/Last Changed Rev:/ {print $4}' dev-repo/DIST_SVN_REVISION.txt)
334334
335-
echo "::group::Grails PPMC Vote Email"
335+
echo "::group::Grails PMC Vote Email"
336336
echo "*************************************************"
337-
echo "Subject: [VOTE] Release Apache Grails (incubating) Spring Security Plugin ${VERSION}"
337+
echo "Subject: [VOTE] Release Apache Grails Spring Security Plugin ${VERSION}"
338338
echo "*************************************************"
339339
echo "Body:"
340340
echo "*************************************************"
341341
cat ${{ needs.publish.outputs.extract_repository_name }}/.github/vote_templates/staged.txt | envsubst
342342
echo "*************************************************"
343343
echo "::endgroup::"
344-
- name: '📧 Print Groovy Vote Email'
345-
env:
346-
VERSION: ${{ needs.publish.outputs.release_version }}
347-
VERSION_COMMIT_ID: ${{ needs.publish.outputs.commit_hash }}
348-
run: |
349-
export DIST_SVN_REVISION=$(awk '/Last Changed Rev:/ {print $4}' dev-repo/DIST_SVN_REVISION.txt)
350-
351-
echo "::group::Grails PPMC Vote Email"
352-
echo "*************************************************"
353-
echo "Subject: [VOTE] Approval of Apache Grails (incubating) Spring Security Plugin ${VERSION} release by Groovy PMC"
354-
echo "*************************************************"
355-
echo "Body:"
356-
echo "*************************************************"
357-
cat ${{ needs.publish.outputs.extract_repository_name }}/.github/vote_templates/groovy_pmc.txt | envsubst
358-
echo "*************************************************"
359-
echo "::endgroup::"
360344
release:
361345
environment: release
362346
name: 'VOTE SUCCEEDED - Release Artifacts'
@@ -367,12 +351,7 @@ jobs:
367351
run: curl -s https://api.ipify.org
368352
- name: "Setup SVN and Tools"
369353
run: sudo apt-get install -y subversion subversion-tools tree gettext-base
370-
- name: "🗳 Grails PPMC Vote Confirmation - MANUAL"
371-
run: |
372-
echo "::group::Manual Confirmation"
373-
echo "🔎 This step is a placeholder that the vote confirmation on dev@grails.apache.org completed successfully."
374-
echo "::endgroup::"
375-
- name: "🗳 Groovy PMC Vote Confirmation - MANUAL"
354+
- name: "🗳 Grails Vote Confirmation - MANUAL"
376355
run: |
377356
echo "::group::Manual Confirmation"
378357
echo "🔎 This step is a placeholder that the vote confirmation on dev@grails.apache.org completed successfully."
@@ -392,7 +371,6 @@ jobs:
392371
echo "::group::Manual ASF Reporter Update"
393372
TODAY=$(date +"%Y-%m-%d")
394373
echo "Check email & update https://reporter.apache.org to mark the release ${{ needs.publish.outputs.release_version }} as complete as of ${TODAY}"
395-
echo "Note: this is a place holder; currently this is not possible since Groovy sponsors us instead of the incubator PMC"
396374
echo "::endgroup::"
397375
docs:
398376
environment: docs
@@ -472,7 +450,7 @@ jobs:
472450
473451
echo "::group::Announcement Email"
474452
echo "*************************************************"
475-
echo "Subject: [ANNOUNCE] Apache Grails (incubating) Spring Security Plugin ${VERSION}"
453+
echo "Subject: [ANNOUNCE] Apache Grails Spring Security Plugin ${VERSION}"
476454
echo "*************************************************"
477455
echo "Body:"
478456
echo "*************************************************"

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Code of Conduct
22

3-
Apache Grails (Incubating) follows the ASF [Code of Conduct](https://www.apache.org/foundation/policies/conduct).
3+
Apache Grails follows the ASF [Code of Conduct](https://www.apache.org/foundation/policies/conduct).
44

55
If you observe behavior that violates those rules please follow the
66
[ASF reporting guidelines](https://www.apache.org/foundation/policies/conduct#reporting-guidelines).

DISCLAIMER

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)