From 644eef6bf526d5f29cc2346a600b362c20e3241a Mon Sep 17 00:00:00 2001 From: The Apache Software Foundation Date: Fri, 15 May 2026 17:32:05 -0500 Subject: [PATCH 1/5] Set up default protection ruleset for default and release branches --- .asf.yaml | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 3532c5d3188..fd50379ae62 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -15,8 +15,8 @@ github: description: "Apache OFBiz is an open source product for the automation of enterprise processes. It includes framework components and business applications for ERP, CRM, E-Business/E-Commerce, Supply Chain Management and Manufacturing Resource Planning. OFBiz provides a foundation and starting point for reliable, secure and scalable enterprise solutions." - homepage: https://ofbiz.apache.org/ - dependabot_alerts: true + homepage: https://ofbiz.apache.org/ + dependabot_alerts: true dependabot_updates: false labels: - ofbiz @@ -34,18 +34,31 @@ github: - hacktoberfest enabled_merge_buttons: # enable squash button: - squash: true + squash: true # default commit message when merging with a squash commit # can either be: DEFAULT | PR_TITLE | PR_TITLE_AND_COMMIT_DETAILS | PR_TITLE_AND_DESC squash_commit_message: PR_TITLE_AND_DESC # enable merge button: - merge: true + merge: true # default commit message when merging with a merge commit # can either be: DEFAULT | PR_TITLE | PR_TITLE_AND_DESC merge_commit_message: PR_TITLE_AND_DESC # enable rebase button: - rebase: true + rebase: 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 notifications: - jobs: notifications@ofbiz.apache.org + jobs: notifications@ofbiz.apache.org jira_options: link label From 3fd2ab50b7b76204c1fe8b4c71d71ef07687e094 Mon Sep 17 00:00:00 2001 From: Jacopo Cappellato Date: Sat, 16 May 2026 10:18:00 +0200 Subject: [PATCH 2/5] Fine tune the default branch protection rules provided by Infra to comply with the OFBiz naming convention for release branches and to enforce linear history --- .asf.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index fd50379ae62..1010b984748 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -52,13 +52,14 @@ github: branches: includes: - "~DEFAULT_BRANCH" - - "release/*" - - "rel/*" + - "release*" excludes: [] bypass_teams: - root restrict_deletion: true restrict_force_push: true + required_linear_history: true + notifications: jobs: notifications@ofbiz.apache.org jira_options: link label From 06a19f5b7aa99aaa67cd9dc2e785da9c293edbaa Mon Sep 17 00:00:00 2001 From: Jacopo Cappellato Date: Sat, 16 May 2026 10:31:32 +0200 Subject: [PATCH 3/5] Add reference to documentation, clean up comments in .asf.yaml and make merge button configuration consistent with required_linear_history --- .asf.yaml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 1010b984748..09814a0ec58 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -13,6 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +# This file is used to configure ASF GitHub repositories. +# It is used by the ASF GitHub bot to automate various tasks such as labeling, +# merging, and notifications. +# For more information, see https://github.com/apache/infrastructure-asfyaml/blob/main/README.md + github: description: "Apache OFBiz is an open source product for the automation of enterprise processes. It includes framework components and business applications for ERP, CRM, E-Business/E-Commerce, Supply Chain Management and Manufacturing Resource Planning. OFBiz provides a foundation and starting point for reliable, secure and scalable enterprise solutions." homepage: https://ofbiz.apache.org/ @@ -32,20 +37,13 @@ github: - content - geospatial - hacktoberfest + enabled_merge_buttons: - # enable squash button: + merge: false + rebase: true squash: true - # default commit message when merging with a squash commit - # can either be: DEFAULT | PR_TITLE | PR_TITLE_AND_COMMIT_DETAILS | PR_TITLE_AND_DESC squash_commit_message: PR_TITLE_AND_DESC - # enable merge button: - merge: true - # default commit message when merging with a merge commit - # can either be: DEFAULT | PR_TITLE | PR_TITLE_AND_DESC - merge_commit_message: PR_TITLE_AND_DESC - # enable rebase button: - rebase: true - + rulesets: - name: "Default Branch Protection" type: branch From 40f5095cfdd0af15cd26e07230286d7329a2d158 Mon Sep 17 00:00:00 2001 From: Jacopo Cappellato Date: Sat, 16 May 2026 10:33:09 +0200 Subject: [PATCH 4/5] Reorder dependabot settings in .asf.yaml for clarity --- .asf.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 09814a0ec58..06c5422aa0d 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -21,8 +21,6 @@ github: description: "Apache OFBiz is an open source product for the automation of enterprise processes. It includes framework components and business applications for ERP, CRM, E-Business/E-Commerce, Supply Chain Management and Manufacturing Resource Planning. OFBiz provides a foundation and starting point for reliable, secure and scalable enterprise solutions." homepage: https://ofbiz.apache.org/ - dependabot_alerts: true - dependabot_updates: false labels: - ofbiz - plugins @@ -58,6 +56,9 @@ github: restrict_force_push: true required_linear_history: true + dependabot_alerts: true + dependabot_updates: false + notifications: jobs: notifications@ofbiz.apache.org jira_options: link label From 0d2013f78c372a58d3c937a7a4447a1c056c17cd Mon Sep 17 00:00:00 2001 From: Jacopo Cappellato Date: Sat, 16 May 2026 10:44:56 +0200 Subject: [PATCH 5/5] Add all possible notification settings to .asf.yaml With these settings, the OFBiz project can manage all notifications on a self-service basis. These values match the existing setup and should not change the current email notifications. --- .asf.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index 06c5422aa0d..5cca6464bb5 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -60,5 +60,9 @@ github: dependabot_updates: false notifications: + commits: commits@ofbiz.apache.org + discussions: notifications@ofbiz.apache.org # discussions are not used, but we want to be notified if they are created + issues: notifications@ofbiz.apache.org # issues are not used, but we want to be notified if they are created + pullrequests: notifications@ofbiz.apache.org jobs: notifications@ofbiz.apache.org - jira_options: link label + jira_options: link label # if a JIRA issue is mentioned in the title of a pull request, add to the JIRA issue a comment with a link to the pull request and add the "has-pull-request" label to the JIRA issue