This is an automated email from the ASF dual-hosted git repository. lprimak pushed a commit to branch 3.x in repository https://gitbox.apache.org/repos/asf/shiro.git
commit e86ab188c9fbb6c8de9b7dd8ddcecd4248998491 Merge: b65b28dc0 8e50c91ff Author: lprimak <[email protected]> AuthorDate: Tue Feb 10 09:31:48 2026 -0600 Merge branch 'main' into 3.x .github/linters/.yaml-lint.yml | 3 ++- .github/workflows/codeql.yml | 7 ++++--- .github/workflows/scorecards.yml | 2 +- .pre-commit-config.yaml | 7 +++++++ .../apache/shiro/realm/ldap/DefaultLdapRealm.java | 4 ++-- .../java/org/apache/shiro/realm/package-info.java | 2 +- .../main/java/org/apache/shiro/session/Session.java | 2 +- .../mgt/AbstractValidatingSessionManager.java | 2 +- .../java/org/apache/shiro/subject/PrincipalMap.java | 2 +- .../apache/shiro/crypto/cipher/CipherService.java | 2 +- .../crypto/cipher/DefaultBlockCipherService.java | 2 +- .../org/apache/shiro/crypto/hash/AbstractHash.java | 2 +- .../main/java/org/apache/shiro/crypto/hash/Hash.java | 2 +- .../org/apache/shiro/crypto/hash/HashRequest.java | 2 +- .../org/apache/shiro/crypto/hash/SimpleHash.java | 2 +- .../crypto/hash/format/DefaultHashFormatFactory.java | 2 +- .../main/java/org/apache/shiro/event/EventBus.java | 2 +- .../apache/shiro/event/support/DefaultEventBus.java | 2 +- .../webapp/WEB-INF/errorpages/invalidErrorPage.xhtml | 1 - .../src/main/webapp/WEB-INF/faces-config.xml | 2 +- .../java/org/apache/shiro/lang/util/SoftHashMap.java | 2 +- pom.xml | 8 ++++---- .../src/main/resources/templates/account-info.html | 2 +- .../src/main/resources/templates/fragments/head.html | 2 +- .../src/main/resources/templates/hello.html | 2 +- .../src/main/resources/templates/login.html | 2 +- shiro.doap.rdf | 20 ++++++++++---------- src/checkstyle.xml | 2 +- src/suppressions.xml | 2 +- support/features/pom.xml | 2 +- .../src/main/resources/META-INF/faces-config.xml | 2 +- .../main/resources/META-INF/shiro-faces.taglib.xml | 2 +- .../src/main/resources/META-INF/web-fragment.xml | 2 +- .../org/apache/shiro/web/servlet/SimpleCookie.java | 2 +- 34 files changed, 56 insertions(+), 48 deletions(-)
