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 0208ad28280cc4ce686cc53e02d3dbae3156fada
Merge: 9092214fc b495c2c4b
Author: lprimak <le...@flowlogix.com>
AuthorDate: Tue Jul 1 16:34:06 2025 -0500
Merge branch 'main' into 3.x
.github/pull_request_template.md | 14 ++++-----
.github/workflows/codeql.yml | 4 +--
.github/workflows/scorecards.yml | 10 +++----
.mvn/wrapper/maven-wrapper.properties | 2 +-
CONTRIBUTING.md | 8 ++---
NOTICE | 6 ++--
README.md | 2 +-
cache/src/main/resources/META-INF/NOTICE | 6 ++--
config/core/src/main/resources/META-INF/NOTICE | 6 ++--
.../shiro/config/ogdl/ReflectionBuilder.java | 2 +-
config/ogdl/src/main/resources/META-INF/NOTICE | 6 ++--
.../activedirectory/ActiveDirectoryRealm.java | 4 +--
.../java/org/apache/shiro/realm/text/IniRealm.java | 2 +-
core/src/main/resources/META-INF/NOTICE | 6 ++--
.../shiro/test/SecurityManagerTestSupport.java | 2 +-
crypto/cipher/src/main/resources/META-INF/NOTICE | 6 ++--
crypto/core/src/main/resources/META-INF/NOTICE | 6 ++--
crypto/hash/pom.xml | 2 +-
crypto/hash/src/main/resources/META-INF/NOTICE | 4 +--
crypto/support/hashes/argon2/pom.xml | 6 ++--
crypto/support/hashes/bcrypt/pom.xml | 6 ++--
event/src/main/resources/META-INF/NOTICE | 6 ++--
integration-tests/jakarta-ee/pom.xml | 2 +-
.../shiro/testing/jakarta/ee/ShiroBeansIT.java | 6 ++--
integration-tests/jaxrs/tests/pom.xml | 2 +-
lang/src/main/resources/META-INF/NOTICE | 6 ++--
pom.xml | 16 +++++-----
samples/aspectj/pom.xml | 34 +++++++++++-----------
samples/aspectj/src/main/resources/META-INF/NOTICE | 6 ++--
.../aspectj/bank/SecureBankServiceTest.java | 10 +++----
.../src/test/resources/shiroBankServiceTest.ini | 6 ++--
samples/guice/src/main/resources/META-INF/NOTICE | 6 ++--
.../src/main/resources/META-INF/NOTICE | 6 ++--
.../quickstart-guice/src/main/resources/shiro.ini | 2 +-
.../quickstart/src/main/resources/META-INF/NOTICE | 6 ++--
samples/quickstart/src/main/resources/shiro.ini | 2 +-
.../src/main/resources/META-INF/NOTICE | 6 ++--
.../src/main/resources/META-INF/NOTICE | 6 ++--
.../src/main/resources/META-INF/NOTICE | 6 ++--
.../spring-boot/src/main/resources/META-INF/NOTICE | 6 ++--
.../src/main/resources/META-INF/NOTICE | 6 ++--
samples/spring-mvc/pom.xml | 4 +--
.../spring-mvc/src/main/resources/META-INF/NOTICE | 6 ++--
samples/spring/pom.xml | 2 +-
samples/spring/src/main/resources/META-INF/NOTICE | 6 ++--
.../web-jakarta/src/main/resources/META-INF/NOTICE | 6 ++--
samples/web/src/main/resources/META-INF/NOTICE | 6 ++--
.../src/test/resources/shiroDummyServiceTest.ini | 2 +-
.../main/java/org/apache/shiro/cdi/AopHelper.java | 12 ++++----
support/guice/src/main/resources/META-INF/NOTICE | 2 +-
support/jakarta-ee/pom.xml | 2 +-
.../shiro/ee/faces/tags/HasAnyPermissionTag.java | 4 +--
.../apache/shiro/ee/faces/tags/HasAnyRolesTag.java | 6 ++--
.../shiro/ee/filters/FormResubmitSupport.java | 12 ++++----
support/jaxrs/pom.xml | 2 +-
support/jaxrs/src/main/resources/META-INF/NOTICE | 6 ++--
support/jcache/src/main/resources/META-INF/NOTICE | 2 +-
support/quartz/src/main/resources/META-INF/NOTICE | 2 +-
support/spring-boot/pom.xml | 2 +-
support/spring/src/main/resources/META-INF/NOTICE | 2 +-
tools/hasher/src/main/resources/META-INF/NOTICE | 6 ++--
.../shiro/web/filter/mgt/FilterChainManager.java | 2 +-
.../shiro/web/mgt/DefaultWebSubjectFactory.java | 2 +-
.../org/apache/shiro/web/tags/HasAnyRolesTag.java | 6 ++--
web/src/main/resources/META-INF/NOTICE | 6 ++--
65 files changed, 182 insertions(+), 182 deletions(-)
diff --cc
samples/aspectj/src/test/java/org/apache/shiro/samples/aspectj/bank/SecureBankServiceTest.java
index 5197c7107,ac3fe6677..b9ee02175
---
a/samples/aspectj/src/test/java/org/apache/shiro/samples/aspectj/bank/SecureBankServiceTest.java
+++
b/samples/aspectj/src/test/java/org/apache/shiro/samples/aspectj/bank/SecureBankServiceTest.java
@@@ -175,9 -173,9 +175,9 @@@ public class SecureBankServiceTest
long accountId = createAndValidateAccountFor("Chris Smith");
logoutCurrentSubject();
- loginAsSuperviser();
+ loginAsSupervisor();
double closingBalance = service.closeAccount(accountId);
- assertEquals(0, (int) closingBalance);
+ assertThat((int) closingBalance).isEqualTo(0);
assertAccount("Chris Smith", false, 0, 1, accountId);
}
@@@ -188,9 -186,9 +188,9 @@@
makeDepositAndValidateAccount(accountId, 385, "Gerry Smith");
logoutCurrentSubject();
- loginAsSuperviser();
+ loginAsSupervisor();
double closingBalance = service.closeAccount(accountId);
- assertEquals(385, (int) closingBalance);
+ assertThat((int) closingBalance).isEqualTo(385);
assertAccount("Gerry Smith", false, 0, 2, accountId);
}
