You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2026/05/16 09:11:58 UTC

(ofbiz-framework) branch trunk updated (9659f494aa -> 8e2e0f81f4)

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

jacopoc pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


    from 9659f494aa Fixed: Order view page CSS leak from embedded email communication content (OFBIZ-13390) (#1213)
     new ced19c8646 Set up default protection ruleset for default and release branches
     new b568e54ec1 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
     new 15930bd309 Add reference to documentation, clean up comments in .asf.yaml and make merge button configuration consistent with required_linear_history
     new ab0510b19b Reorder dependabot settings in .asf.yaml for clarity
     new 8e2e0f81f4 Add all possible notification settings to .asf.yaml

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .asf.yaml | 49 +++++++++++++++++++++++++++++++++----------------
 1 file changed, 33 insertions(+), 16 deletions(-)


(ofbiz-framework) 02/05: 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

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jacopoc pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit b568e54ec1a8bc7ef84106cef49ba61cbf8f5956
Author: Jacopo Cappellato <ja...@gmail.com>
AuthorDate: Sat May 16 10:18:00 2026 +0200

    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 fd50379ae6..1010b98474 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


(ofbiz-framework) 05/05: Add all possible notification settings to .asf.yaml

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jacopoc pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 8e2e0f81f494f611be6ef21cb1bcf1ffc618b7df
Author: Jacopo Cappellato <ja...@gmail.com>
AuthorDate: Sat May 16 10:44:56 2026 +0200

    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 06c5422aa0..5cca6464bb 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


(ofbiz-framework) 04/05: Reorder dependabot settings in .asf.yaml for clarity

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jacopoc pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit ab0510b19b579ba4a90438d47c7ff375a424a288
Author: Jacopo Cappellato <ja...@gmail.com>
AuthorDate: Sat May 16 10:33:09 2026 +0200

    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 09814a0ec5..06c5422aa0 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


(ofbiz-framework) 03/05: Add reference to documentation, clean up comments in .asf.yaml and make merge button configuration consistent with required_linear_history

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jacopoc pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 15930bd309d7bdc31949b269afde5374a3f4f18a
Author: Jacopo Cappellato <ja...@gmail.com>
AuthorDate: Sat May 16 10:31:32 2026 +0200

    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 1010b98474..09814a0ec5 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


(ofbiz-framework) 01/05: Set up default protection ruleset for default and release branches

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jacopoc pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit ced19c8646e1e19f5f552734c1e6c17e7de7bf6d
Author: The Apache Software Foundation <ro...@apache.org>
AuthorDate: Fri May 15 17:32:05 2026 -0500

    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 3532c5d318..fd50379ae6 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