This is an automated email from the ASF dual-hosted git repository.

snoopdave pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git


The following commit(s) were added to refs/heads/master by this push:
     new 66c4a818d Use Apache Trusted Releases in the roller-release skill 
(#240)
66c4a818d is described below

commit 66c4a818da0341047b25fdd12ef630d0b587e414
Author: David M. Johnson <[email protected]>
AuthorDate: Sat Nov 14 11:43:55 2026 -0500

    Use Apache Trusted Releases in the roller-release skill (#240)
    
    * Centralize skill sources and preserve harness compatibility
    
    * Adopt Apache Trusted Releases workflow for Roller 7
    
    * Remove unrelated skill centralization from ATR PR
    
    * Describe ATR workflow for Roller 7.x and later
    
    * Clarify ATR release workflow guidance
    
    * Update skills/roller-release/references/atr.md
    
    Co-authored-by: Matt Raible <[email protected]>
    
    * Update skills/roller-release/references/atr.md
    
    Co-authored-by: Matt Raible <[email protected]>
    
    * Repeat the ATR auto-publish instruction in the vote section and re-wrap 
the prerequisites bullet
    
    ---------
    
    Co-authored-by: Matt Raible <[email protected]>
---
 skills/roller-release/SKILL.md                     |  43 +++++--
 skills/roller-release/references/asf-policy.md     |   5 +-
 skills/roller-release/references/atr.md            | 139 ++++++++++++++++++---
 skills/roller-release/references/dist-svn.md       |   6 +-
 skills/roller-release/references/signing-key.md    |  13 +-
 .../roller-release/references/vote-and-announce.md |  32 ++++-
 skills/roller-release/references/website.md        |   6 +
 7 files changed, 207 insertions(+), 37 deletions(-)

diff --git a/skills/roller-release/SKILL.md b/skills/roller-release/SKILL.md
index ef3e1d749..5fc0f2d5d 100644
--- a/skills/roller-release/SKILL.md
+++ b/skills/roller-release/SKILL.md
@@ -1,6 +1,6 @@
 ---
 name: roller-release
-description: Prepare, build, sign, verify, stage, vote on and publish Apache 
Roller releases, including release website updates and announcement drafts.
+description: Prepare, build, sign, verify, stage, vote on and publish Apache 
Roller releases, using Apache Trusted Releases for Roller 7.x and later and SVN 
for 6.1.x, including website updates and announcement drafts.
 ---
 
 <!--
@@ -27,11 +27,20 @@ Use the current checkout, project release decisions and
 personal signing setup and undisclosed security scope outside this skill.
 Loading the skill does not authorize sending mail, pushing tags or publishing.
 
+## Select the workflow
+
+Use [Apache Trusted Releases (ATR)](references/atr.md) for Roller 7.x and 
later.
+Build locally and sign with the release manager's personal key. ATR manages 
staging, voting,
+publication and announcement; this does not enable CI signing or Trusted 
Publishing.
+Use [SVN distribution](references/dist-svn.md) for 6.1.x.
+Do not switch an active vote between workflows or run both publication paths 
for the same candidate.
+
 ## Establish release inputs
 
 Record the source checkout, target branch and exact commit; release version;
 RC number and tag; release-manager ASF ID; signing-key fingerprint; 
distribution
-working copies; and website checkout. Supply these from the actual release,
+working copies for the SVN path, or ATR project and candidate revision; and
+website checkout. Supply these from the actual release,
 not defaults from an earlier session. Use a clean tree or isolated checkout.
 
 Check build documentation and CI for the branch's supported JDK. Confirm Maven,
@@ -53,24 +62,34 @@ Use [signing-key guidance](references/signing-key.md) 
before building a candidat
    (normally `mvn -V -ntp clean install`). Build `assembly-release` separately
    with `mvn -f assembly-release/pom.xml package`; it is outside the root 
reactor.
 5. Inspect the source and binary tar/zip archives. Sign and generate checksums
-   using [signing instructions](references/signing-key.md).
+   using [signing instructions](references/signing-key.md). For ATR, use final
+   archive filenames from the start; identify RCs with Git tags and ATR 
revisions.
 6. Run `scripts/check-release.sh <artifact-dir>` from this skill. Its optional
    `--build` compiles the source archive with tests skipped; it does not 
replace
    the test suite, a full license review, or independent voter verification.
-7. Stage and download the candidate using [distribution 
guidance](references/dist-svn.md).
-   Verify signatures, checksums, contents and source build from the downloaded 
files.
+7. Stage and download through the selected workflow: [ATR 
compose](references/atr.md)
+   for Roller 7.x and later or [SVN staging](references/dist-svn.md) for 6.1.x.
+   Verify signatures, checksums and contents. From the unpacked downloaded 
source,
+   run `mvn -V -ntp clean install` to build and test the files voters will 
receive.
 
 ## Vote and publish
 
-Use [vote and announcement templates](references/vote-and-announce.md). 
Normally
+Follow the selected workflow and review
+[vote and announcement templates](references/vote-and-announce.md). Normally
 allow at least 72 hours and require at least three positive binding votes and
 more positive than negative binding votes. Check current policy for exceptions.
 Record the result and the exact approved candidate.
 
-Promote the approved artifact bytes; do not rebuild. If filenames lose the RC
-suffix, detached signatures still verify those unchanged bytes, but checksum
-filenames must be updated and verified. Point the final Git tag at the approved
-RC commit. Inspect remote destination paths before distribution changes.
+For ATR releases, follow [ATR vote and finish](references/atr.md). Review ATR's
+email forms and tally; publish explicitly after approval, then update the 
website
+before triggering ATR's announcement. Do not also send the manual SVN messages 
or
+promote files with SVN. Keep automatic publication and archiving off.
+
+For SVN releases, promote the approved artifact bytes; do not rebuild. If
+filenames lose the RC suffix, detached signatures still verify those unchanged
+bytes, but checksum filenames must be updated and verified. For either 
workflow,
+point the final Git tag at the approved RC commit. Inspect remote destination
+paths before distribution changes.
 
 Update and publish the [website](references/website.md), verify public download
 links and propagation, then announce. Prune superseded distributions only after
@@ -87,10 +106,10 @@ when the advisory is published.
 
 - [ASF policy](references/asf-policy.md): authoritative sources and review 
boundaries.
 - [Signing](references/signing-key.md): explicit signer selection and 
verification.
-- [Distribution](references/dist-svn.md): staging, promotion and pruning.
+- [SVN distribution](references/dist-svn.md): 6.1.x staging, promotion and 
pruning.
 - [Vote and announcement](references/vote-and-announce.md): reusable message 
drafts.
 - [Website](references/website.md): source edits, rebuild and link 
verification.
-- [Release tooling](references/atr.md): evaluating Apache Trusted Releases.
+- [ATR](references/atr.md): setup, compose, vote and finish.
 
 Resolve helper paths relative to this skill; when using the repository copy,
 they are under `skills/roller-release/scripts/`. Helpers do not commit or 
publish.
diff --git a/skills/roller-release/references/asf-policy.md 
b/skills/roller-release/references/asf-policy.md
index 2adca93d0..a787f4cc2 100644
--- a/skills/roller-release/references/asf-policy.md
+++ b/skills/roller-release/references/asf-policy.md
@@ -25,8 +25,9 @@ Consult these sources when cutting a release; this skill is 
not a policy snapsho
   distribution channels, signatures, digests, download links and archive 
handling.
 - [Release signing](https://infra.apache.org/release-signing.html): key and 
signature guidance.
 - [Release publishing](https://infra.apache.org/release-publishing.html): 
operational steps.
-- [Roller release 
process](https://cwiki.apache.org/confluence/spaces/ROLLER/pages/75651/Release+Process):
-  project instructions; verify paths and commands against the current checkout.
+- [ATR migration](https://releases.apache.org/docs/moving-to-atr) and
+  [ATR release phases](https://releases.apache.org/docs/making-releases): 
current
+  staging, voting and publication behavior.
 
 A source release is the approved artifact; binary packages are convenience
 artifacts. Release approval requires at least three positive binding votes and
diff --git a/skills/roller-release/references/atr.md 
b/skills/roller-release/references/atr.md
index 328c6b4c6..6a410af89 100644
--- a/skills/roller-release/references/atr.md
+++ b/skills/roller-release/references/atr.md
@@ -15,22 +15,131 @@ See the License for the specific language governing 
permissions and
 limitations under the License.
 -->
 
-# Evaluating Apache Trusted Releases
+# Apache Trusted Releases
 
-[Apache Trusted Releases](https://releases.apache.org) is an alternative 
release
-workflow to evaluate with the PMC. Check its current documentation, 
availability,
-project enrollment and supported packaging before adoption; this skill does not
-pin a platform status or participating-project list.
+Use [ATR](https://releases.apache.org/docs/) for Roller 7.x and later with 
local
+builds and personal OpenPGP signing. ATR manages staging and publication. The 
PMC
+approves the release; ATR checks supplement human verification. [Trusted 
Publishing](https://releases.apache.org/docs/trusted-publishing)
+is a separate CI signing workflow requiring reproducibility and ASF approvals;
+it is outside this process. Recheck current ATR documentation at release time.
 
-Try a non-publishing rehearsal and establish how the chosen tool handles:
+## Release prerequisites
 
-- Source and convenience binary archives, signatures and checksums.
-- Existing project distribution layout and KEYS handling.
-- Candidate identity, vote evidence, cancellation and replacement.
-- Promotion of the exact approved bytes and website coordination.
-- Access control and the separation of private security coordination from
-  public release artifacts and messages.
+Follow [Getting started](https://releases.apache.org/docs/getting-started) and
+[Moving to ATR](https://releases.apache.org/docs/moving-to-atr):
 
-Agree the workflow and ownership before a release deadline. Keep the evaluation
-and any per-release decision in project planning records. Do not switch an 
active
-release between tools without reconciling candidate identity and approval 
evidence.
+- Sign in with ASF MFA. Confirm PMC membership or PMC designation as a release
+  manager. Verify the actual Roller project key, committee, repositories and
+  catalog; do not assume seeded data is correct.
+- Confirm the signing public key is associated with Roller and is present in 
the
+  published committee KEYS file. Retain SVN-managed KEYS (ATR's default import
+  mode); update keys in SVN.
+- Review [project 
configuration](https://releases.apache.org/docs/project-configuration):
+  metadata, release version policy, source checks, vote recipients and 
templates,
+  download page, announcement recipients and destination suffix. ATR's default
+  top-level project path can publish directly under 
`dist/release/<committee>/`,
+  while Roller uses `dist/release/roller/roller-<major.minor>/v<version>/`.
+  Set and verify the destination suffix on the Finish page, for example
+  `roller-7.0/v7.0.0` (ATR adds the `roller/` committee directory itself). Its
+  supported tokens are
+  `{{PROJECT_KEY}}`, `{{VERSION}}`, and `{{MAJOR_VERSION}}`; do not assume a
+  custom path token. The ATR client's `--auto-publish` option does not honor 
the
+  configured path, so leave it off and publish manually from the reviewed 
Finish
+  page. Record the resolved path in the release work record.
+- Use Email vote mode and the normal minimum of 72 hours. Roller may default to
+  Trusted vote mode, and the start-vote form doesn't offer a choice, so set 
Vote
+  mode to Email in the project settings and confirm it took effect before
+  starting the vote. On the start-vote form, leave **Automatically publish to
+  SVN distribution area when this vote resolves** unchecked. On the Finish tab,
+  leave **Allow auto-archive** disabled. Review settings shared across release
+  lines; preserve the latest release of each supported line.
+- Inspect any `.asf.yaml` project configuration before editing settings in ATR:
+  synchronization from the default branch can overwrite manual changes. Record
+  required configuration work separately; reading this skill does not configure
+  the service or establish readiness.
+
+## Compose and verify
+
+1. Build and test the exact recorded RC commit using the main skill. Use final
+   archive filenames, without an RC suffix, so publication needs no renaming or
+   checksum edits. Run `assembly-release/sign-release.sh "$VERSION"` with the
+   selected `ROLLER_SIGNING_KEY` exported. Do not re-sign after the vote.
+2. Start a candidate in the confirmed Roller project for the final release
+   version. Use the compose page's **Upload files** browser form to upload only
+   the intended source and convenience binary archives, `.asc` signatures and
+   SHA-256/SHA-512 sidecars. Supply the full 40-character source commit.
+   See [Uploading files](https://releases.apache.org/docs/uploading-files).
+3. Wait for archive validation and checks to finish. If validation rejects the
+   upload, fix the issue and upload the whole rejected set again. For oversized
+   browser requests, upload smaller batches; if necessary follow ATR's 
documented
+   rsync route and explicitly record the same source commit.
+4. Resolve blockers and investigate other concerns, including source comparison
+   and licensing. The source archive named
+   `apache-roller-<version>-source.tar.gz` currently extracts to
+   `roller-weblogger-<version>-source/`, so ATR reports an archive-structure
+   concern because the root does not match the archive base. Review and
+   acknowledge that concern with the reason, or rename the root before the 
first
+   Roller 7 release. Do not suppress checks just to start voting. Record the 
final
+   ATR revision, candidate URL, manifest, archive filenames and digests, signer
+   fingerprint, RC tag and source commit.
+   Optionally give the revision an immutable RC tag in ATR.
+5. Download that revision to a fresh directory using its candidate page's 
download
+   instructions. Verify the inventory against the
+   [file manifest](https://releases.apache.org/docs/file-manifest), signatures,
+   checksums and contents; run `scripts/check-release.sh <dir>` and build/test
+   the downloaded source. ATR's manifest digests do not replace detached
+   signatures or the project's checksum sidecars.
+
+## Vote and replacement candidates
+
+Review the vote email form against [the message 
guidance](vote-and-announce.md).
+Include the SHA-512 digest for every candidate archive in the vote email; the
+same final filenames are reused across RCs, so voters need the digests to 
identify
+the bytes under review. Copy the values from the candidate's checksum sidecars
+and verify them against the pinned revision. ATR can fetch vote and 
announcement
+email templates from an `apache.org` or `raw.githubusercontent.com` URL 
configured
+for the project; whoever sends the email can review and edit the fetched text.
+Use that facility when Roller has reviewed plain-text templates hosted in this
+repository, and verify the rendered email before sending. Use the ATR candidate
+page as the sole authoritative artifact location, plus committee KEYS. Identify
+the pinned revision and source tag/commit; do not present another artifact copy
+as part of the vote. Start the email vote through ATR only when sending it is
+authorized. On the start-vote form, leave **Automatically publish to SVN
+distribution area when this vote resolves** unchecked; publish manually from 
the
+reviewed Finish page. See
+[Staging and voting](https://releases.apache.org/docs/staging-and-voting).
+
+Allow the normal voting period, then check ATR's tally against the mailing-list
+thread and current PMC membership. Require at least three positive binding 
votes
+and more positive than negative binding votes. Record the result, thread and 
exact
+approved revision before explicitly resolving the vote in ATR.
+
+A failed or cancelled vote returns to compose. Preserve the old revision and 
vote
+evidence; fix the candidate, increment the RC number, record a new immutable RC
+Git tag as appropriate, and upload a new ATR revision. Repeat verification and
+start a fresh vote on the replacement. Never silently replace voted artifacts 
or
+reuse an earlier approval for changed bytes.
+
+## Finish, website and announcement
+
+Follow [Promoting to 
release](https://releases.apache.org/docs/promoting-to-release):
+
+1. After the vote passes, review the finish page's destination and approved
+   inventory. Confirm KEYS availability and explicitly click Publish on the
+   Finish page. Automatic publication is controlled by a checkbox on the
+   start-vote form, not by the Finish tab. ATR
+   commits to `svn:dist:release`; do not also run the SVN promotion steps.
+   Preserve approved filenames, bytes and signatures. Record the resulting SVN
+   revision and download URL; point the final Git tag at the approved RC 
commit.
+2. Check public downloads, signatures and checksums against the approved 
candidate.
+   If propagation is delayed, wait and retry verification; do not rebuild,
+   re-upload or announce. Record any required external distributions 
separately;
+   ATR does not publish to package registries for the project.
+3. Publish the [website update](website.md) and verify the live download page 
and
+   its links. Review the announcement form and recipients, then trigger ATR's
+   announcement once authorized. ATR also checks download reachability. Do not
+   send a duplicate manual announcement. Coordinate advisory timing with the 
PMC
+   and ASF Security using the main skill's confidentiality requirements.
+4. Leave automatic archiving disabled. Any later cleanup must confirm archive
+   availability, website links and which releases remain supported, including
+   6.1.x.
diff --git a/skills/roller-release/references/dist-svn.md 
b/skills/roller-release/references/dist-svn.md
index 45203d281..03d0d6f19 100644
--- a/skills/roller-release/references/dist-svn.md
+++ b/skills/roller-release/references/dist-svn.md
@@ -15,7 +15,11 @@ See the License for the specific language governing 
permissions and
 limitations under the License.
 -->
 
-# Distribution staging and promotion
+# SVN distribution for Roller 6.1.x
+
+Use this procedure for 6.1.x.
+For Roller 7.x and later use [ATR](atr.md), which owns staging and 
publication. Do not run
+these promotion steps alongside ATR for the same candidate.
 
 Confirm the current project layout before preparing paths:
 
diff --git a/skills/roller-release/references/signing-key.md 
b/skills/roller-release/references/signing-key.md
index 27fe1677e..2936ee1ec 100644
--- a/skills/roller-release/references/signing-key.md
+++ b/skills/roller-release/references/signing-key.md
@@ -41,10 +41,21 @@ usage; in versions supporting positional inputs, run from 
the repository root:
 assembly-release/sign-release.sh "$VERSION" "$RC_SUFFIX"
 ```
 
+For releases through [ATR](atr.md), omit the RC suffix:
+
+```sh
+assembly-release/sign-release.sh "$VERSION"
+```
+
+Keep final filenames throughout the ATR vote and publication; use the RC Git 
tag
+and pinned ATR revision to identify the candidate. The optional suffix 
invocation
+above remains available for the SVN workflow.
+
 The current script expects `ROLLER_SIGNING_KEY` in its environment. Export it
 explicitly in the release session. Confirm that the script signs with the 
intended
 key and uses an approved digest. Do not transplant an old signing script from
-release notes. Generate armored detached signatures and SHA-256 and/or SHA-512
+release notes. For ATR, confirm ATR has imported the signer from SVN-managed
+KEYS before uploading. Generate armored detached signatures and SHA-256 and/or 
SHA-512
 checksum sidecars; avoid legacy digest formats.
 
 Verify every archive's signature against its bytes and every checksum from the
diff --git a/skills/roller-release/references/vote-and-announce.md 
b/skills/roller-release/references/vote-and-announce.md
index 4b55fa97b..0c711e4a2 100644
--- a/skills/roller-release/references/vote-and-announce.md
+++ b/skills/roller-release/references/vote-and-announce.md
@@ -22,7 +22,27 @@ artifact checksums and signer fingerprint. Do not send 
messages merely because a
 template has been filled. Keep undisclosed security characterization out of 
public
 vote threads and release notes before coordinated announcement.
 
-## Vote
+## ATR messages
+
+Use ATR's vote, result and announcement forms. Review the actual generated 
text,
+recipients, candidate revision, source commit, fingerprint and public URLs 
before
+sending. The templates below are content guidance; they are not ATR template
+syntax. Do not paste bracketed placeholders into project settings. Consult the
+variables offered by each ATR field if customizing its stored templates.
+
+For the vote, replace `[staging URL]` with the pinned ATR candidate page, the 
sole
+authoritative artifact location. Link committee KEYS; source tag and release 
notes
+are informational, not alternate artifact downloads. Resolve the result in ATR
+after checking the tally against the thread. Trigger the announcement through 
ATR
+only after publication, propagation and live website verification. Do not also
+send the manual messages below. See [ATR procedure](atr.md).
+
+## SVN messages (6.1.x)
+
+Send these drafts manually only for the SVN workflow, after review and
+authorization. For either workflow, keep recipients and binding-vote checks 
current.
+
+### Vote
 
 Subject: [VOTE] Release Apache Roller [version] ([candidate])
 
@@ -43,7 +63,7 @@ at least 72 hours for review under the normal process.
 
 [Release manager name]
 
-## Result
+### Result
 
 Subject: [RESULT][VOTE] Release Apache Roller [version] ([candidate])
 
@@ -58,7 +78,7 @@ Approved candidate, if passed: [exact tag, commit and 
artifact location]
 
 [Release manager name]
 
-## Release announcement
+### Release announcement
 
 Subject: [ANNOUNCE] Apache Roller [version] released
 
@@ -77,11 +97,11 @@ formatting. Tally binding votes by PMC membership; do not 
count every +1 as bind
 Check membership against the ASF roster (for example the public LDAP projects 
data),
 not the project website's committer list, which can lag.
 
-Send the announcement from your `@apache.org` address; [email protected] 
rejects
-other senders without warning. Confirm it in the announce@ archive.
+For a manual announcement, send from your `@apache.org` address; 
[email protected] rejects
+other senders without warning. Confirm delivery in the announce@ archive for 
either workflow.
 
 When a release carries undisclosed security fixes, keep the announcement, 
release
 notes, blog posts and website neutral until the advisories are sent: describe
 behaviour changes and upgrade guidance without characterizing the fixes.
 Instructions given to anyone writing that text must not reveal what is being
-withheld.
\ No newline at end of file
+withheld.
diff --git a/skills/roller-release/references/website.md 
b/skills/roller-release/references/website.md
index ebbe25a59..61e14754d 100644
--- a/skills/roller-release/references/website.md
+++ b/skills/roller-release/references/website.md
@@ -42,6 +42,12 @@ be enabled, and inline HTML is the safer choice.
 A project security page must not list or hint at undisclosed CVEs. Link CVE 
records
 only once they are published.
 
+For ATR releases, [ATR](atr.md) publishes the approved artifacts first. Keep 
ATR's
+announcement pending until the live website and links have been verified; ATR's
+propagation check alone does not validate the project download page. Keep
+superseded-release cleanup manual and preserve supported 6.1.x
+releases. Use ATR's actual published paths when updating links.
+
 Publish the website only when the approved release artifacts are available.
 Verify the live page and links before announcement, then prune superseded
 releases within the agreed scope. Keep release-specific website defects in the

Reply via email to