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

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

@@ -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"