From afe37126802060401bdb7f85d802122be61e6bb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Volkan=20Yaz=C4=B1c=C4=B1?= <volkan@yazi.ci>
Date: Fri, 28 Nov 2025 15:24:18 +0100
Subject: [PATCH 1/2] 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>

From 0b5dc706b6c690ec8eb303c098eccc349cff82cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Volkan=20Yaz=C4=B1c=C4=B1?= <volkan@yazi.ci>
Date: Mon, 1 Dec 2025 10:06:39 +0100
Subject: [PATCH 2/2] Fix `log4j.version`

Co-authored-by: Piotr P. Karwasz <piotr.github@karwasz.org>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3fa81ed..3241e69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@
 
     <!-- dependency version -->
     <junit.version>4.13.2</junit.version>
-    <log4j.version>2.25.0-SNAPSHOT</log4j.version>
+    <log4j.version>2.25.2</log4j.version>
     <mockito.version>4.11.0</mockito.version>
     <scalatest.version>3.2.10</scalatest.version>
     <scalatestplus.version>3.2.10.0</scalatestplus.version>