This is an automated email from the ASF dual-hosted git repository. lprimak pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/shiro.git
commit 4207abc9561487efeb1f3cea41d7fa70ba739356 Author: lprimak <[email protected]> AuthorDate: Tue Jun 16 15:26:50 2026 -0500 chore(asf.yaml): correct merge buttons are now enabled (squash, rebase) and merge chore(dependabot): don't update major version of checkstyle in 2.x --- .asf.yaml | 6 +++--- .github/dependabot.yml | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 678955ec0..a4e545e71 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -29,8 +29,8 @@ github: discussions: true enabled_merge_buttons: squash: true - merge: true - rebase: false + merge: false + rebase: true rulesets: - name: "Branch Protection" type: branch @@ -47,7 +47,7 @@ github: required_linear_history: true required_conversation_resolution: false required_pull_request_reviews: - dismiss_stale_reviews: true + dismiss_stale_reviews: false require_last_push_approval: false require_code_owner_reviews: false required_approving_review_count: 0 diff --git a/.github/dependabot.yml b/.github/dependabot.yml index da908adf1..407c1d16b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -53,6 +53,9 @@ updates: - dependency-name: "org.aspectj:*" update-types: [ "version-update:semver-patch" ] + - dependency-name: "com.puppycrawl.tools:checkstyle" + update-types: [ "version-update:semver-major" ] + - dependency-name: "org.springframework*:*" update-types: [ "version-update:semver-major" ] - dependency-name: "com.flowlogix:flowlogix-jee"
