From a797caf17a6196963c83e5dbaaa6d582bf275b29 Mon Sep 17 00:00:00 2001
From: The Apache Software Foundation <root-asf-gitbox-commits@apache.org>
Date: Fri, 15 May 2026 16:08:30 -0500
Subject: [PATCH 1/2] Set up default protection ruleset for default and release
 branches

---
 .asf.yaml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.asf.yaml b/.asf.yaml
index a436ef45..bbc235c4 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -39,3 +39,16 @@ github:
         - id: sbglasius
           type: User
       wait_timer: 0
+  rulesets:
+    - name: "Default Branch Protection"
+      type: branch
+      branches:
+        includes:
+          - "~DEFAULT_BRANCH"
+          - "release/*"
+          - "rel/*"
+        excludes: []
+      bypass_teams:
+        - root
+      restrict_deletion: true
+      restrict_force_push: true

From 0e156ea11fb995a3c0c32d530c218cdc0100812c Mon Sep 17 00:00:00 2001
From: James Fredley <jamesfredley@users.noreply.github.com>
Date: Thu, 28 May 2026 23:04:25 -0400
Subject: [PATCH 2/2] [INFRA] Use Grails *.x version branch pattern for branch
 protection

Replace the generic release/* and rel/* include patterns (which match no
branches in Grails repositories) with *.x, the naming convention Grails uses
for maintenance/version branches (e.g. 7.0.x, 8.0.x).

Assisted-by: claude-code:claude-4.8-opus
---
 .asf.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index bbc235c4..1d32e888 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -45,8 +45,7 @@ github:
       branches:
         includes:
           - "~DEFAULT_BRANCH"
-          - "release/*"
-          - "rel/*"
+          - "*.x"
         excludes: []
       bypass_teams:
         - root