chore: additional and supporting updates

Author: lprimak

.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

.github/dependabot.yml

@@ -69,6 +69,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"

.jenkins.groovy

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-def deployableBranch = env.BRANCH_NAME ==~ /(1.13.x|2.x|3.x|4.x|main)/
+def deployableBranch = env.BRANCH_NAME ==~ /(main|4.x)/
 def latestSupportedJDK = 'jdk_25_latest'
 def builtinVersion = '999-SNAPSHOT'
 def nextVersion
@@ -107,10 +107,9 @@ pipeline {
                                 def parts = latestRelease.tokenize('.')
                                 def nextPatch = parts[2].toInteger() + 1
                                 nextVersion = "${parts[0]}.${parts[1]}.${nextPatch}-SNAPSHOT"
-                                if (env.BRANCH_NAME == '2.x') {
-                                    nextVersion = '2.0.0-SNAPSHOT'
-                                }
-                                if (env.BRANCH_NAME == '3.x') {
+                                if (env.BRANCH_NAME == '4.x') {
+                                    nextVersion = '4.0.0-SNAPSHOT'
+                                } else if (parts[0].toInteger() < 3) {
                                     nextVersion = '3.0.0-SNAPSHOT'
                                 }
 

3.X-NOTES

@@ -27,9 +27,9 @@
         <version>999-SNAPSHOT</version>
     </parent>
 
-	<artifactId>shiro-its-guice</artifactId>
-	<name>Apache Shiro :: ITs :: Guice</name>
-	<packaging>war</packaging>
+    <artifactId>shiro-its-guice</artifactId>
+    <name>Apache Shiro :: ITs :: Guice</name>
+    <packaging>war</packaging>
 
     <properties>
         <groups>none()</groups>