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 95d1157d4481c1808a1f73324414f4ad8712dcb5 Merge: 32ba1ba33 866bd8456 Author: lprimak <[email protected]> AuthorDate: Sun Feb 8 00:26:16 2026 -0600 Merge remote-tracking branch 'upstream/3.x' into 3.x core/pom.xml | 2 +- crypto/support/hashes/argon2/pom.xml | 2 +- crypto/support/hashes/bcrypt/pom.xml | 2 +- pom.xml | 4 +- support/aspectj/pom.xml | 2 +- support/features/pom.xml | 70 +++++++++++++++--------- support/features/src/main/resources/features.xml | 52 +++++------------- support/guice/pom.xml | 2 +- support/pom.xml | 2 +- support/spring/pom.xml | 2 +- 10 files changed, 67 insertions(+), 73 deletions(-)
