Merge branch 'main' into fix-vulnerabilities

Author: lprimak

.asf.yaml

@@ -24,13 +24,15 @@ github:
     wiki: false
     issues: true
     projects: true
+    discussions: true
   enabled_merge_buttons:
-    squash: false
+    squash: true
     merge: true
     rebase: false
 
 notifications:
   pullrequests: [email protected]
   commits: [email protected]
   issues: [email protected]
+  discussions: [email protected]
   jira_options: link label worklog

.github/pull_request_template.md

@@ -8,15 +8,14 @@ Following this checklist to help us incorporate your contribution quickly and ea
  - [ ] Make sure there is a [GitHub issue](https://github.com/apache/shiro/issues) filed
        for the change (usually before you start working on it).  Trivial changes like typos do not
        require a GitHub issue.  Your pull request should address just this issue, without pulling in other changes.
- - [ ] Each commit in the pull request should have a meaningful subject line and body.
  - [ ] Format the pull request title like `[#XXX] - Fixes bug in SessionManager`,
        where you replace `#XXX` with the appropriate GitHub issue. Best practice
        is to use the GitHub issue title in the pull request title and in the first line of the commit message.
  - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  - [ ] add `fixes #XXX` if merging the PR should close a related issue.
  - [ ] Run `mvn verify` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically.
- - [ ] If you have a group of commits related to the same change, please squash your commits into one and force push your branch using `git rebase -i`.
  - [ ] Committers: Make sure a milestone is set on the PR
+ - [ ] Committers: Use "Squash and Merge" to combine all commits into one when merging a PR when appropriate.
 
 Trivial changes like typos do not require a GitHub issue (javadoc, comments...).
 In this case, just format the pull request title like `[DOC] - Add javadoc in SessionManager`.

.pre-commit-config.yaml

@@ -24,7 +24,9 @@ repos:
   - repo: meta
     hooks:
       - id: identity
+        description: A simple hook which prints all arguments passed to it, useful for debugging
       - id: check-hooks-apply
+        description: Useful when testing new hooks to see if they apply to the repository
   - repo: https://github.com/codespell-project/codespell
     rev: v2.4.1
     hooks:
@@ -36,21 +38,36 @@ repos:
     rev: v6.0.0
     hooks:
       - id: check-case-conflict
+        description: Check for files with names that would conflict on a case-insensitive filesystem like MacOS HFS+ or Windows FAT
       - id: check-executables-have-shebangs
+        description: Checks that non-binary executables have a proper shebang
       - id: check-illegal-windows-names
+        description: Check for files that cannot be created on Windows
       - id: check-json
+        description: Attempts to load all json files to verify syntax
       - id: check-merge-conflict
+        description: Check for files that contain merge conflict strings
       - id: check-shebang-scripts-are-executable
+        description: Checks that scripts with shebangs are executable
       - id: check-vcs-permalinks
+        description: Ensures that links to vcs websites are permalinks
       - id: check-xml
+        description: Attempts to load all xml files to verify syntax
       - id: check-yaml
+        description: Attempts to load all yaml files to verify syntax
       - id: destroyed-symlinks
+        description: Detects symlinks which are changed to regular files with a content of a path which that symlink was pointing to
       - id: detect-aws-credentials
+        description: Checks for the existence of AWS secrets that you have set up with the AWS CLI
         args: [--allow-missing-credentials]
       - id: detect-private-key
+        description: Checks for the existence of private keys
       - id: end-of-file-fixer
+        description: Makes sure files end in a newline and only a newline
       - id: forbid-submodules
+        description: Forbids any submodules in the repository
       - id: trailing-whitespace
+        description: Trims trailing whitespace
         args: [--markdown-linebreak-ext=md]
   - repo: https://github.com/igorshubovych/markdownlint-cli
     rev: v0.45.0
@@ -81,6 +98,7 @@ repos:
     rev: v1.7.8
     hooks:
       - id: actionlint
+        description: actionlint is a static checker for GitHub Actions workflow files
   - repo: https://github.com/oxipng/oxipng
     rev: v9.1.5
     hooks: