From 278e180f97f2d96cd5da4f2917fadbd43baa4596 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Mon, 26 Jan 2026 10:31:58 +0100 Subject: [PATCH 1/2] chore(deps): excludes org.apache.tomcat:tomcat-api for Struts 6.x --- .github/dependabot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 46dbdede00..ea0d1fa6a8 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -32,3 +32,4 @@ updates: - dependency-name: "org.springframework:spring-core" - dependency-name: "org.apache.struts:struts-annotations" - dependency-name: "org.apache.juneau:juneau-marshall" + - dependency-name: "org.apache.tomcat:tomcat-api" From f34942cc0345bd9cc750c1075f37db9368ad4b09 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Mon, 26 Jan 2026 10:34:31 +0100 Subject: [PATCH 2/2] chore(conf): Enables auto-merge of PRs --- .asf.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.asf.yaml b/.asf.yaml index f49aa6ff46..cc75ef5e03 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -33,6 +33,11 @@ github: # it does not work because our github teams are private/secret, see INFRA-25666 require_code_owner_reviews: false required_approving_review_count: 0 + pull_requests: + # allow auto-merge + allow_auto_merge: true + # auto-delete head branches after being merged + del_branch_on_merge: true autolink_jira: - WW dependabot_alerts: true