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

---
 .asf.yaml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index c0e6069a..7b9b5900 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -14,5 +14,18 @@ github:
   del_branch_on_merge: true
   autolink_jira:
     - WW
-  dependabot_alerts:  true
+  dependabot_alerts: true
   dependabot_updates: true
+  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 e2347f0ad845036fddda1e0f93b96c64130f639d Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Wed, 17 Jun 2026 10:22:29 +0200
Subject: [PATCH 2/2] Add struts-committers to bypass teams in .asf.yaml

---
 .asf.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index 7b9b5900..246994ed 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -23,9 +23,9 @@ github:
         includes:
           - "~DEFAULT_BRANCH"
           - "release/*"
-          - "rel/*"
         excludes: []
       bypass_teams:
         - root
+        - "struts-committers"
       restrict_deletion: true
       restrict_force_push: true