You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2025/11/28 14:24:26 UTC

(logging-log4j-scala) branch commitSigs created (now afe3712)

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

vy pushed a change to branch commitSigs
in repository https://gitbox.apache.org/repos/asf/logging-log4j-scala.git


      at afe3712  Disable commit signatures

This branch includes the following new commits:

     new afe3712  Disable commit signatures

The 1 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.



(logging-log4j-scala) 01/01: Disable commit signatures

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

vy pushed a commit to branch commitSigs
in repository https://gitbox.apache.org/repos/asf/logging-log4j-scala.git

commit afe37126802060401bdb7f85d802122be61e6bb7
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Fri Nov 28 15:24:18 2025 +0100

    Disable commit signatures
---
 .asf.yaml | 25 +++++++++++++++++++++++--
 pom.xml   |  2 +-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 3fa0b5d..69af55c 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -46,7 +46,15 @@ github:
     - logger
     - scala
 
-  del_branch_on_merge: true
+  # Pull Request settings:
+  # https://github.com/apache/infrastructure-asfyaml#pull-request-settings
+  pull_requests:
+    # allow auto-merge
+    allow_auto_merge: true
+    # enable updating head branches of pull requests
+    allow_update_branch: true
+    # auto-delete head branches after being merged
+    del_branch_on_merge: true
 
   # Enforce squashing while merging PRs.
   # Otherwise, the git log gets polluted severely.
@@ -60,4 +68,17 @@ github:
 
   protected_branches:
     main:
-      required_signatures: true
+      # All reviews must be addressed before merging
+      required_conversation_resolution: true
+      # Require checks to pass before merging
+      required_status_checks:
+        checks:
+          # The GitHub Actions app: 15368
+          - app_id: 15368
+            context: "build / build (ubuntu-latest)"
+          # The GitHub Advanced Security app: 57789
+          - app_id: 57789
+            context: "CodeQL"
+      # At least one positive review must be present
+      required_pull_request_reviews:
+        required_approving_review_count: 1
diff --git a/pom.xml b/pom.xml
index ca246af..3fa81ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@
 
     <!-- dependency version -->
     <junit.version>4.13.2</junit.version>
-    <log4j.version>2.24.0</log4j.version>
+    <log4j.version>2.25.0-SNAPSHOT</log4j.version>
     <mockito.version>4.11.0</mockito.version>
     <scalatest.version>3.2.10</scalatest.version>
     <scalatestplus.version>3.2.10.0</scalatestplus.version>