Skip to content

[HOLD until maven-sources#57 swap] Switch default-branch metadata to Maven 3 (.asf.yaml + .github) - #340

Open
ascheman wants to merge 1 commit into
apache:maven-source-plugin-3.xfrom
aschemaven:feature/57-branch-swap-prep
Open

ascheman wants to merge 1 commit into
apache:maven-source-plugin-3.xfrom
aschemaven:feature/57-branch-swap-prep

Conversation

@ascheman

@ascheman ascheman commented Oct 9, 2026

Copy link
Copy Markdown

Part of apache/maven-sources#57 (switching plugin default branches back to Maven 3, cf. Plan / runbook).

⛔ DO NOT MERGE before the swap. This PR should be merged immediately around the branch rename on 2026-10-18 (coordinated with INFRA). Please review/approve by 2026-10-16 so it can be merged right at the switch.

This prepares the maven-source-plugin-3.x branch to become the default master after the swap. Config GitHub reads from the default branch must already live on the incoming default branch, or it is silently dropped at the switch.

What changes

.asf.yaml

Adopts the current master's .asf.yaml wholesale (branch protection, project metadata, features — whatever master carries today), with the single intended difference being the protected-branch rename maven-source-plugin-3.x → maven-source-plugin-4.x:

-    maven-source-plugin-3.x: {}
+    maven-source-plugin-4.x: {}

Why: ASF asfyaml only honours the default branch's .asf.yaml, so anything that lives only on today's master would be silently lost once this dormant -3.x branch becomes the new master. No default_branch is set — the default pointer is restored to master by INFRA as part of the renames.

It also drops the -3.x-only, now-vestigial jira_options / autolink_jira (not present on master; the Maven JIRA has migrated to GitHub issues). Say so in review if you want it kept on the Maven 3 line.

.github/

.github/ is read from the default branch, so the swap must carry the repo-wide, default-sourced parts or they silently drop:

  • adds the ISSUE_TEMPLATE/ forms and the scheduled stale.yml that master has and this branch was missing;
  • aligns pull_request_template.md to master's current version.

Line-specific config stays the Maven 3 line's — dependabot.yml, the maven-verify CI, and release-drafter (workflow + any config) are deliberately left untouched. Whether the Maven 3 line should auto-draft releases is a separate call for @slawekjaranowski, not something to flip silently here.

Short inconsistency window after merge

Until the rename completes and Jenkins re-discovers branches, job/master is still today's Maven 4 job and the -4.x job doesn't exist yet, so some badges/links briefly point at not-yet-existing branches. Expected; it resolves once the 2026-10-18 swap finishes.

Prepare the maven-source-plugin-3.x branch to become the default master after the
apache/maven-sources#57 branch swap. Config read from the default
branch must already live on the incoming default branch:

- .asf.yaml: adopt the current master's content, renaming only the
  protected 4.x branch (maven-source-plugin-3.x -> maven-source-plugin-4.x); the diff vs master is
  exactly that one line.
- .github: carry over the repo-wide, default-branch-sourced
  ISSUE_TEMPLATE forms and the scheduled stale.yml, and align
  pull_request_template.md to master. Line-specific config
  (dependabot, maven-verify CI, release-drafter) stays the Maven 3
  line's.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SJcgjSha5PNT8WFBMC1v5b
@ascheman
ascheman requested a review from hboutemy October 9, 2026 22:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant