From f49349d7d0a4d1dbdea4029d73a5b3587652cd9e Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Mon, 26 Jan 2026 11:32:21 +0100 Subject: [PATCH] chore(deps): excludes org.apache.tomcat:tomcat-api for Struts 6.x (#1548) * chore(deps): excludes org.apache.tomcat:tomcat-api for Struts 6.x * chore(conf): Enables auto-merge of PRs --- .asf.yaml | 5 +++++ .github/dependabot.yml | 1 + 2 files changed, 6 insertions(+) diff --git a/.asf.yaml b/.asf.yaml index f49aa6ff4..cc75ef5e0 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 diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 46dbdede0..ea0d1fa6a 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"