Merge branch 'main' into change-pathtraversal-blockmode

resolved conflicts, cleanup and compiles / tests pass

Author: lprimak

.asf.yaml

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

.editorconfig

@@ -0,0 +1,31 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# EditorConfig is awesome: https://editorconfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+
+[*.rdf]
+indent_size = 4
+indent_style = space

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -33,7 +33,7 @@ body:
         first to see whether the same issue was reported already.
       options:
         - label: >
-            I had searched in the [issues](https://github.com/apache/shiro/issues?q=is%3Aissue) and found
+            I had searched in the [issues, **including closed issues**](https://github.com/apache/shiro/issues?q=is%3Aissue) and found
             no similar issues.
           required: true
 
@@ -95,4 +95,4 @@ body:
 
   - type: markdown
     attributes:
-      value: "Thanks for completing our form!"
+      value: "Thanks for completing our form!"

.github/ISSUE_TEMPLATE/documentation_related.yml

@@ -29,11 +29,11 @@ body:
     attributes:
       label: Search before asking
       description: >
-        Please make sure to search in the [issues](https://github.com/apache/shiro/issues?q=is%3Aissue)
+        Please make sure to search in the [issues, **including closed issues**](https://github.com/apache/shiro/issues?q=is%3Aissue)
         first to see whether the same issue was reported already.
       options:
         - label: >
-            I had searched in the [issues](https://github.com/apache/shiro/issues?q=is%3Aissue) and found
+            I had searched in the [issues, **including closed issues**](https://github.com/apache/shiro/issues?q=is%3Aissue) and found
             no similar issues.
           required: true
 
@@ -57,4 +57,4 @@ body:
 
   - type: markdown
     attributes:
-      value: "Thanks for completing our form!"
+      value: "Thanks for completing our form!"

.github/ISSUE_TEMPLATE/enhancement_request.yml

@@ -29,7 +29,7 @@ body:
     attributes:
       label: Search before asking
       description: >
-        Please make sure to search in the [issues](https://github.com/apache/shiro/issues?q=is%3Aissue)
+        Please make sure to search in the [issues, **including closed issues**](https://github.com/apache/shiro/issues?q=is%3Aissue)
         first to see whether the same issue was reported already.
       options:
         - label: >
@@ -67,4 +67,4 @@ body:
 
   - type: markdown
     attributes:
-      value: "Thanks for completing our form!"
+      value: "Thanks for completing our form!"

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -29,11 +29,11 @@ body:
     attributes:
       label: Search before asking
       description: >
-        Please make sure to search in the [issues](https://github.com/apache/shiro/issues?q=is%3Aissue)
+        Please make sure to search in the [issues, **including closed issues**](https://github.com/apache/shiro/issues?q=is%3Aissue)
         first to see whether the same issue was reported already.
       options:
         - label: >
-            I had searched in the [issues](https://github.com/apache/shiro/issues?q=is%3Aissue) and found
+            I had searched in the [issues, **including closed issues**](https://github.com/apache/shiro/issues?q=is%3Aissue) and found
             no similar issues.
           required: true
 
@@ -59,4 +59,4 @@ body:
 
   - type: markdown
     attributes:
-      value: "Thanks for completing our form!"
+      value: "Thanks for completing our form!"

.github/ISSUE_TEMPLATE/question.yml

@@ -29,11 +29,11 @@ body:
     attributes:
       label: Search before asking
       description: >
-        Please make sure to search in the [issues](https://github.com/apache/shiro/issues?q=is%3Aissue)
+        Please make sure to search in the [issues, **including closed issues**](https://github.com/apache/shiro/issues?q=is%3Aissue)
         first to see whether the same issue was reported already.
       options:
         - label: >
-            I had searched in the [issues](https://github.com/apache/shiro/issues?q=is%3Aissue) and found
+            I had searched in the [issues, **including closed issues**](https://github.com/apache/shiro/issues?q=is%3Aissue) and found
             no similar issues.
           required: true
 
@@ -48,4 +48,4 @@ body:
 
   - type: markdown
     attributes:
-      value: "Thanks for completing our form!"
+      value: "Thanks for completing our form!"

.github/dependabot.yml

@@ -21,91 +21,110 @@ updates:
   - package-ecosystem: 'maven'
     directory: '/'
     schedule:
-      interval: 'daily'
+      interval: 'weekly'
     open-pull-requests-limit: 50
     ignore:
       - dependency-name: "jakarta.platform:*"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
       - dependency-name: "jakarta.activation:jakarta.activation-api"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
       - dependency-name: "jakarta.annotation:jakarta.annotation-api"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
       - dependency-name: "jakarta.enterprise:*"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
       - dependency-name: "jakarta.xml.bind:jakarta.xml.bind-api"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
       - dependency-name: "jakarta.servlet.*:*"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
       - dependency-name: "jakarta.ws.rs:jakarta.ws.rs-api"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
       - dependency-name: "jakarta.validation:jakarta.validation-api"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
       - dependency-name: "org.glassfish.web:jakarta.servlet.jsp.jstl"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
       - dependency-name: "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
       - dependency-name: "org.glassfish.jaxb:jaxb-runtime"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
       - dependency-name: "org.omnifaces:omnifaces"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
+
+      - dependency-name: "org.aspectj:*"
+        update-types: [ "version-update:semver-patch" ]
 
       - dependency-name: "org.springframework*:*"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
       - dependency-name: "com.flowlogix:flowlogix-jee"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
 
       - dependency-name: "org.eclipse.jetty:*"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.apache.cxf:*"
+        update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.apache.johnzon:*"
+        update-types: [ "version-update:semver-major" ]
+      - dependency-name: "com.hazelcast:*"
+        update-types: [ "version-update:semver-minor" ]
 
-  # Dependencies for Maven - on 1.12.x
+  # Dependencies for Maven - on 1.13.x
   - package-ecosystem: 'maven'
     directory: '/'
-    target-branch: '1.12.x'
+    target-branch: '1.13.x'
     schedule:
-      interval: 'daily'
+      interval: 'monthly'
     open-pull-requests-limit: 50
     ignore:
       - dependency-name: "jakarta.servlet.*:*"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
       - dependency-name: "javax.servlet:javax.servlet-api"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
       - dependency-name: "org.glassfish.web:jakarta.servlet.jsp.jstl"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
       - dependency-name: "org.glassfish.jersey.*:*"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
 
       - dependency-name: "org.jasig.cas.client:*"
-        update-types: ["version-update:semver-minor"]
+        update-types: [ "version-update:semver-minor" ]
       - dependency-name: "org.slf4j:*"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
       - dependency-name: "org.codehaus.groovy:*"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
       - dependency-name: "ch.qos.logback:logback-classic"
-        update-types: ["version-update:semver-minor"]
+        update-types: [ "version-update:semver-minor" ]
       - dependency-name: "com.hazelcast:hazelcast"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
       - dependency-name: "org.aspectj:*"
-        update-types: ["version-update:semver-patch"]
+        update-types: [ "version-update:semver-patch" ]
 
       - dependency-name: "org.springframework*:*"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
 
       - dependency-name: "org.eclipse.jetty:*"
-        update-types: ["version-update:semver-major"]
+        update-types: [ "version-update:semver-major" ]
       - dependency-name: "com.github.mjeanroy:junit-servers-jetty"
-        update-types: ["version-update:semver-minor"]
+        update-types: [ "version-update:semver-minor" ]
+      - dependency-name: "com.hazelcast:*"
+        update-types: [ "version-update:semver-minor" ]
 
   # Dependencies for GitHub Actions
   - package-ecosystem: 'github-actions'
     directory: '/'
     schedule:
-      interval: 'daily'
+      interval: 'weekly'
     open-pull-requests-limit: 10
+    groups:
+      github-dependencies:
+        patterns:
+          - '*'
 
-  # Dependencies for GitHub Actions - on 1.12.x
+  # Dependencies for GitHub Actions - on 1.13.x
   - package-ecosystem: 'github-actions'
     directory: '/'
-    target-branch: '1.12.x'
+    target-branch: '1.13.x'
     schedule:
-      interval: 'daily'
+      interval: 'monthly'
     open-pull-requests-limit: 10
+    groups:
+      github-dependencies:
+        patterns:
+          - '*'

.github/labeler.yml

@@ -0,0 +1,36 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# https://github.com/actions/labeler
+github_actions:
+  - any:
+      - changed-files:
+          - any-glob-to-any-file:
+              - .github/**/*
+
+java:
+  - any:
+      - changed-files:
+          - any-glob-to-any-file:
+              - '**/*.java'
+
+tests:
+  - any:
+      - changed-files:
+          - any-glob-to-any-file:
+              - '**/src/test/groovy/**/*'
+              - '**/src/test/java/**/*'

.github/linters/.markdown-lint.yml

@@ -0,0 +1,34 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# MD013/line-length Line length
+MD013: false
+
+# MD014/commands-show-output Dollar signs used before commands without showing output
+MD014: false
+
+# MD033/no-inline-html Inline HTML
+MD033: false
+
+# MD034/no-bare-urls Bare URL used
+MD034: false
+
+# MD040/fenced-code-language Fenced code blocks should have a language specified
+MD040: false
+
+# MD041/first-line-heading/first-line-h1 First line in a file should be a top-level heading
+MD041: false