You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by gi...@apache.org on 2026/06/17 12:57:52 UTC
(shiro) branch dependabot/github_actions/github-actions-dependencies-22d1c6afc5 updated (1d9061402 -> 19aa29d37)
This is an automated email from the ASF dual-hosted git repository.
dependabot[bot] pushed a change to branch dependabot/github_actions/github-actions-dependencies-22d1c6afc5
in repository https://gitbox.apache.org/repos/asf/shiro.git
discard 1d9061402 chore(deps): bump actions/setup-java
omit a0af4ef9e chore(dependabot): don't update checkstyle for 2.x
omit 7d4829cbf *** TEMPORARY *** disable main branch protection
omit efd594d9a chore(asf.yaml): don't dismiss stale reviews
omit 90288b44a * chore(asf.yaml): correct merge buttons are now enabled (squash, rebase) and merge
add 4207abc95 chore(asf.yaml): correct merge buttons are now enabled (squash, rebase) and merge chore(dependabot): don't update major version of checkstyle in 2.x
add b06d2b490 GitHub issue #1548. Declare PrincipalCollection interface to be intended to be immutable; provide an immutable implementation including a builder class; deprecate the mutable implementation; use the immutable one in SimpleAuthenticationInfo for merging.
add 4aaa3ce4f Refactor: AssertJ best practices by @timtebeek
add 2b75a3bda Set pom version to 3.0.0-SNAPSHOT
add ea59e279c [project] Add 3.X change guidelines
add 2e83661ac chore(3.x): Migrate to jakarta EE 10 using OpenRewrite (#2224)
add 43cedf2e1 [#1585] Migrate to Jakarta EE 10 (3.x) (#2018)
add 592f9b036 [#1585] Jakarta namespace and java 17 for 3x (#2017)
add b3811723e chore: additional and supporting updates
add 19aa29d37 chore(deps): bump actions/setup-java
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (1d9061402)
\
N -- N -- N refs/heads/dependabot/github_actions/github-actions-dependencies-22d1c6afc5 (19aa29d37)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 1 +
.github/dependabot.yml | 68 ++-
.github/workflows/codeql.yml | 6 +
.github/workflows/maven.yml | 14 +-
.jenkins.groovy | 10 +-
.jenkins_maven_args | 2 +-
.mvn/maven.config | 1 +
.pre-commit-config.yaml | 2 +-
NOTICE | 2 +-
RELEASE-NOTES | 5 +
bom/pom.xml | 128 ------
.../apache/shiro/cache/AbstractCacheManager.java | 4 +-
.../src/main/java/org/apache/shiro/config/Ini.java | 6 +-
.../shiro/config/ogdl/ReflectionBuilder.java | 71 ++-
core/pom.xml | 7 +-
.../main/java/org/apache/shiro/SecurityUtils.java | 14 +-
.../shiro/aop/AnnotationMethodInterceptor.java | 2 +-
.../apache/shiro/authc/AbstractAuthenticator.java | 4 +-
.../shiro/authc/MergableAuthenticationInfo.java | 4 +-
.../java/org/apache/shiro/authc/SimpleAccount.java | 32 +-
.../shiro/authc/SimpleAuthenticationInfo.java | 52 ++-
.../authc/credential/DefaultPasswordService.java | 4 +-
.../authc/credential/HashedCredentialsMatcher.java | 8 +-
.../shiro/authc/credential/PasswordMatcher.java | 7 +-
.../authc/pam/AbstractAuthenticationStrategy.java | 4 +-
.../shiro/authc/pam/AllSuccessfulStrategy.java | 4 +-
.../shiro/authc/pam/ModularRealmAuthenticator.java | 4 +-
.../apache/shiro/authz/ModularRealmAuthorizer.java | 8 +-
.../java/org/apache/shiro/authz/SimpleRole.java | 3 +-
.../shiro/authz/aop/DenyAllAnnotationHandler.java | 2 +-
.../authz/aop/PermitAllAnnotationHandler.java | 4 +-
.../authz/aop/RolesAllowedAnnotationHandler.java | 2 +-
.../shiro/authz/aop/UserAnnotationHandler.java | 2 +-
.../shiro/authz/permission/DomainPermission.java | 2 +
.../shiro/authz/permission/WildcardPermission.java | 5 +-
.../shiro/ini/IniSecurityManagerFactory.java | 16 +-
.../java/org/apache/shiro/jndi/JndiLocator.java | 2 +-
.../java/org/apache/shiro/jndi/JndiTemplate.java | 10 +-
.../shiro/mgt/AbstractRememberMeManager.java | 2 +-
.../shiro/mgt/AuthenticatingSecurityManager.java | 4 +-
.../shiro/mgt/AuthorizingSecurityManager.java | 4 +-
.../apache/shiro/mgt/CachingSecurityManager.java | 4 +-
.../apache/shiro/mgt/DefaultSecurityManager.java | 8 +-
.../org/apache/shiro/mgt/RealmSecurityManager.java | 8 +-
.../apache/shiro/mgt/SessionsSecurityManager.java | 8 +-
.../java/org/apache/shiro/realm/CachingRealm.java | 2 +-
.../activedirectory/ActiveDirectoryRealm.java | 12 +-
.../org/apache/shiro/realm/jdbc/JdbcRealm.java | 2 +-
.../apache/shiro/realm/ldap/DefaultLdapRealm.java | 5 +-
.../shiro/realm/ldap/JndiLdapContextFactory.java | 11 +-
.../org/apache/shiro/realm/ldap/LdapUtils.java | 6 +-
.../apache/shiro/realm/text/PropertiesRealm.java | 6 +-
.../java/org/apache/shiro/session/Session.java | 2 +-
.../mgt/AbstractValidatingSessionManager.java | 8 +-
.../shiro/session/mgt/DefaultSessionContext.java | 6 +
.../shiro/session/mgt/DefaultSessionManager.java | 11 +-
.../apache/shiro/session/mgt/SessionContext.java | 2 +-
.../apache/shiro/session/mgt/SimpleSession.java | 136 ++++--
.../shiro/session/mgt/SimpleSessionFactory.java | 8 +-
.../shiro/session/mgt/eis/CachingSessionDAO.java | 18 +-
.../session/mgt/eis/RandomSessionIdGenerator.java | 72 ---
.../shiro/session/mgt/eis/SessionIdGenerator.java | 1 -
.../subject/ImmutablePrincipalCollection.java | 342 ++++++++++++++
.../shiro/subject/MutablePrincipalCollection.java | 6 +-
.../apache/shiro/subject/PrincipalCollection.java | 12 +-
.../shiro/subject/SimplePrincipalCollection.java | 82 ++--
.../java/org/apache/shiro/subject/Subject.java | 41 +-
.../subject/support/DefaultSubjectContext.java | 4 +-
.../shiro/subject/support/DelegatingSubject.java | 7 +-
.../shiro/subject/support/SubjectCallable.java | 19 +-
.../shiro/subject/support/SubjectRunnable.java | 20 +-
.../shiro/subject/support/SubjectThreadState.java | 21 +-
.../org/apache/shiro/util/CollectionUtils.java | 18 +-
...iDependencies.java => DefaultScopedValues.java} | 13 +-
.../org/apache/shiro/util/JavaEnvironment.java | 181 --------
.../java/org/apache/shiro/util/MapContext.java | 2 +
.../java/org/apache/shiro/util/ScopedValues.java | 55 +++
.../org/apache/shiro/util/DefaultScopedValues.java | 60 +++
.../test/java/org/apache/shiro/ExceptionTest.java | 2 +-
.../org/apache/shiro/SecurityUtilsUnwrapTest.java | 27 +-
.../apache/shiro/aop/AnnotationResolverTest.java | 9 +-
.../shiro/authc/AbstractAuthenticatorTest.java | 22 +-
.../shiro/authc/ConcurrentAccessExceptionTest.java | 2 +-
.../authc/ExcessiveAttemptsExceptionTest.java | 2 +-
.../authc/ExpiredCredentialsExceptionTest.java | 2 +-
.../authc/IncorrectCredentialsExceptionTest.java | 2 +-
.../shiro/authc/LockedAccountExceptionTest.java | 2 +-
.../shiro/authc/SimpleAuthenticationInfoTest.java | 28 +-
.../shiro/authc/UnknownAccountExceptionTest.java | 2 +-
.../AbstractHashedCredentialsMatcherTest.java | 6 +-
.../credential/AllowAllCredentialsMatcherTest.java | 4 +-
.../credential/HashedCredentialsMatcherTest.java | 14 +-
.../shiro/authc/pam/AllSuccessfulStrategyTest.java | 8 +-
.../authc/pam/FirstSuccessfulStrategyTest.java | 41 +-
.../shiro/authz/AuthorizationExceptionTest.java | 2 +-
.../shiro/authz/HostUnauthorizedExceptionTest.java | 2 +-
.../shiro/authz/ModularRealmAuthorizerTest.java | 13 +-
.../shiro/authz/UnauthenticatedExceptionTest.java | 2 +-
.../shiro/authz/UnauthorizedExceptionTest.java | 2 +-
.../authz/aop/DenyAllAnnotationHandlerTest.java | 8 +-
.../authz/aop/PermissionAnnotationHandlerTest.java | 8 +-
.../authz/aop/PermitAllAnnotationHandlerTest.java | 2 +-
.../shiro/authz/aop/RoleAnnotationHandlerTest.java | 8 +-
.../aop/RolesAllowedAnnotationHandlerTest.java | 12 +-
.../shiro/authz/permission/AllPermissionTest.java | 6 +-
.../authz/permission/DomainPermissionTest.java | 136 +++---
.../permission/WildcardPermissionResolverTest.java | 22 +-
.../authz/permission/WildcardPermissionTest.java | 202 +++++----
.../shiro/concurrent/SubjectAwareExecutorTest.java | 4 +-
.../apache/shiro/jndi/JndiObjectFactoryTest.java | 28 +-
.../shiro/lang/io/SerializationExceptionTest.java | 2 +-
.../shiro/mgt/AbstractRememberMeManagerTest.java | 6 +-
.../shiro/mgt/DefaultSecurityManagerTest.java | 69 ++-
.../mgt/VMSingletonDefaultSecurityManagerTest.java | 10 +-
.../apache/shiro/realm/AuthorizingRealmTest.java | 77 ++--
.../activedirectory/ActiveDirectoryRealmTest.java | 33 +-
.../org/apache/shiro/realm/jdbc/JDBCRealmTest.java | 14 +-
.../shiro/realm/ldap/DefaultLdapRealmTest.java | 27 +-
.../realm/ldap/JndiLdapContextFactoryTest.java | 80 ++--
.../apache/shiro/realm/ldap/JndiLdapRealmTest.java | 4 +-
.../org/apache/shiro/realm/text/IniRealmTest.java | 15 +-
.../realm/text/TextConfigurationRealmTest.java | 25 +-
.../mgt/AbstractValidatingSessionManagerTest.java | 8 +-
.../session/mgt/DefaultSessionManagerTest.java | 28 +-
.../shiro/session/mgt/DelegatingSessionTest.java | 8 +-
...cutorServiceSessionValidationSchedulerTest.java | 21 +-
.../shiro/session/mgt/SimpleSessionTest.java | 13 +-
.../shiro/subject/DelegatingSubjectTest.java | 130 +++---
.../subject/ImmutablePrincipalCollectionTest.java | 223 ++++++++++
.../subject/SimplePrincipalCollectionTest.java | 11 +-
.../subject/support/DelegatingSubjectTest.java | 6 +-
.../org/apache/shiro/util/AntPathMatcherTests.java | 489 +++++++++++----------
.../apache/shiro/util/RegExPatternMatcherTest.java | 7 +-
.../org/apache/shiro/util/StringUtilsTest.java | 94 ++--
core/src/test/resources/log4j2-list.xml | 2 +-
core/src/test/resources/log4j2-test.xml | 2 +-
crypto/cipher/pom.xml | 4 -
.../shiro/crypto/hash/AbstractCryptHash.java | 5 +-
.../org/apache/shiro/crypto/hash/AbstractHash.java | 5 +-
.../shiro/crypto/hash/DefaultHashService.java | 3 +-
.../org/apache/shiro/crypto/hash/SimpleHash.java | 9 +-
.../hash/format/DefaultHashFormatFactory.java | 8 +-
crypto/support/hashes/argon2/pom.xml | 2 +-
.../crypto/support/hashes/argon2/Argon2Hash.java | 2 +
crypto/support/hashes/bcrypt/pom.xml | 2 +-
.../crypto/support/hashes/bcrypt/BCryptHash.java | 5 +-
.../support/hashes/bcrypt/BCryptProvider.java | 4 +-
.../shiro/event/support/DefaultEventBus.java | 16 +-
.../shiro/event/support/EventClassComparator.java | 8 +-
.../event/support/EventListenerComparator.java | 6 +-
.../support/SingleArgumentMethodEventListener.java | 6 +-
.../shiro/event/support/TypedEventListener.java | 2 +-
integration-tests/{guice4 => guice}/pom.xml | 39 +-
.../samples/guice/SampleShiroGuiceBootstrap.java | 4 +-
.../samples/guice/SampleShiroServletModule.java | 5 +-
.../src/main/resources/log4j2.xml | 4 +-
.../src/main/webapp/WEB-INF/shiro.ini | 0
.../src/main/webapp/WEB-INF/web.xml | 6 +-
.../src/main/webapp/account/index.jsp | 0
.../{guice3 => guice}/src/main/webapp/home.jsp | 0
.../{guice3 => guice}/src/main/webapp/include.jsp | 0
.../{guice3 => guice}/src/main/webapp/index.jsp | 0
.../{guice3 => guice}/src/main/webapp/login.jsp | 0
.../{guice3 => guice}/src/main/webapp/style.css | 0
.../samples/guice/ContainerIntegrationIT.java | 0
integration-tests/guice3/pom.xml | 141 ------
.../samples/guice/SampleShiroGuiceBootstrap.java | 43 --
.../samples/guice/SampleShiroServletModule.java | 89 ----
.../guice3/src/main/resources/log4j2.xml | 68 ---
.../guice4/src/main/webapp/WEB-INF/shiro.ini | 53 ---
.../guice4/src/main/webapp/WEB-INF/web.xml | 43 --
.../guice4/src/main/webapp/account/index.jsp | 36 --
integration-tests/guice4/src/main/webapp/home.jsp | 69 ---
.../guice4/src/main/webapp/include.jsp | 22 -
integration-tests/guice4/src/main/webapp/index.jsp | 21 -
integration-tests/guice4/src/main/webapp/login.jsp | 110 -----
integration-tests/guice4/src/main/webapp/style.css | 47 --
.../samples/guice/ContainerIntegrationIT.java | 79 ----
integration-tests/jakarta-ee/pom.xml | 157 +------
.../shiro/testing/cdi/CipherKeyGenerator.java | 2 +-
.../shiro/testing/cdi/ComponentInjectionBean.java | 4 +-
.../apache/shiro/testing/jakarta/ee/FormBean.java | 2 +-
.../testing/jakarta/ee/PropertyPrincipal.java | 4 +-
.../shiro/testing/jakarta/ee/PropertyRealm.java | 16 +-
.../jakarta/ee/ProtectedFacesViewScopedBean.java | 14 +-
.../jakarta/ee/ProtectedOmniViewScopedBean.java | 12 +-
.../testing/jakarta/ee/ProtectedOneMethod.java | 2 +-
.../jakarta/ee/ProtectedSessionScopedBean.java | 12 +-
.../testing/jakarta/ee/ProtectedStatelessBean.java | 2 +-
.../testing/jakarta/ee/StatisticsResource.java | 12 +-
.../testing/jakarta/ee/UnprotectedFacade.java | 6 +-
.../shiro/testing/jakarta/ee/UseFallback.java | 6 +-
.../jakarta/ee/servlets/ExceptionServlet.java | 14 +-
.../ee/servlets/InvalidateSessionServlet.java | 10 +-
.../testing/jakarta/ee/servlets/LogoutServlet.java | 10 +-
.../testing/jakarta/ee/servlets/RestConfig.java | 4 +-
.../org/apache/shiro/testing/jaxrs/JsonPojo.java | 2 +
.../shiro/testing/jaxrs/RolesAllowedBean.java | 10 +-
.../shiro/testing/jaxrs/TestApplication.java | 16 +-
.../org/apache/shiro/testing/jaxrs/WhoamiBean.java | 4 +-
.../apache/shiro/testing/jaxrs/WhoamiResource.java | 32 +-
.../testing/logcapture/LogCaptureSingleton.java | 8 +-
.../src/main/resources/META-INF/beans.xml | 4 +-
.../WEB-INF/errorpages/invalidErrorPage.xhtml | 12 +-
.../src/main/webapp/WEB-INF/faces-config.xml | 6 +-
.../jakarta-ee/src/main/webapp/WEB-INF/web.xml | 14 +-
.../jakarta-ee/src/main/webapp/index.xhtml | 2 +-
.../src/main/webapp/shiro/adminpage.xhtml | 2 +-
.../src/main/webapp/shiro/auth/loginform.xhtml | 8 +-
.../main/webapp/shiro/auth/unauthenticated.xhtml | 2 +-
.../src/main/webapp/shiro/auth/unauthorized.xhtml | 2 +-
.../jakarta-ee/src/main/webapp/shiro/form.xhtml | 6 +-
.../jakarta-ee/src/main/webapp/shiro/index.xhtml | 2 +-
.../src/main/webapp/shiro/protected.xhtml | 2 +-
.../main/webapp/shiro/unprotected/manybeans.xhtml | 6 +-
.../src/main/webapp/shiro/unprotected/tags.xhtml | 2 +-
.../shiro/testing/cdi/ComponentInjectionIT.java | 40 +-
.../shiro/testing/jakarta/ee/Deployments.java | 3 +-
.../shiro/testing/jakarta/ee/FacesTagsIT.java | 39 +-
.../shiro/testing/jakarta/ee/ShiroAuthFormsIT.java | 62 ++-
.../shiro/testing/jakarta/ee/ShiroBeansIT.java | 58 +--
.../shiro/testing/jakarta/ee/ShiroSSLFilterIT.java | 10 +-
.../apache/shiro/testing/jaxrs/NoIniJaxRsIT.java | 12 +-
integration-tests/jaxrs/app/pom.xml | 21 +-
.../shiro/testing/jaxrs/app/JaxRsApplication.java | 6 +-
.../jaxrs/app/config/JaxRsShiroFeature.java | 6 +-
.../testing/jaxrs/app/config/ShiroListener.java | 4 +-
.../jaxrs/app/config/ShiroServletFilter.java | 6 +-
.../jaxrs/app/dao/InMemoryStormtrooperDao.java | 4 +-
.../jaxrs/app/json/JsonbConfigProvider.java | 14 +-
.../jaxrs/app/json/StormtrooperIdConverter.java | 6 +-
.../testing/jaxrs/app/model/Stormtrooper.java | 4 +-
.../jaxrs/app/model/StormtrooperTemplate.java | 4 +-
.../jaxrs/app/resources/StormtrooperResource.java | 20 +-
.../app/src/main/resources/META-INF/beans.xml | 7 +-
.../jaxrs/app/src/main/webapp/WEB-INF/beans.xml | 7 +-
integration-tests/jaxrs/openliberty/pom.xml | 8 +-
.../openliberty/src/main/liberty/config/server.xml | 8 +-
integration-tests/jaxrs/pom.xml | 2 -
integration-tests/jaxrs/tests/pom.xml | 37 +-
.../testing/jaxrs/tests/AbstractShiroJaxRsIT.java | 24 +-
integration-tests/meecrowave-support/pom.xml | 4 +-
integration-tests/pom.xml | 7 +-
integration-tests/support/pom.xml | 52 +--
.../shiro/testing/web/AbstractContainerIT.java | 86 +---
jitpack.yml | 6 +-
lang/pom.xml | 8 +-
.../org/apache/shiro/lang/codec/CodecSupport.java | 38 +-
.../org/apache/shiro/lang/io/ResourceUtils.java | 61 +--
.../org/apache/shiro/lang/io/XmlSerializer.java | 83 ----
.../java/org/apache/shiro/lang/util/Assert.java | 18 +-
.../org/apache/shiro/lang/util/ByteSource.java | 24 +-
.../apache/shiro/lang/util/ByteSourceWrapper.java | 8 +-
.../java/org/apache/shiro/lang/util/ByteUtils.java | 6 +-
.../org/apache/shiro/lang/util/ClassUtils.java | 55 ++-
.../shiro/lang/util/JspEngineDependency.java | 2 +-
.../org/apache/shiro/lang/util/LifecycleUtils.java | 16 +-
.../apache/shiro/lang/util/SimpleByteSource.java | 5 +-
.../org/apache/shiro/lang/util/SoftHashMap.java | 28 +-
.../org/apache/shiro/lang/util/StringUtils.java | 23 +-
.../org/apache/shiro/lang/util/ClassUtilsTest.java | 104 +++--
lang/src/test/resources/test-data/file.json | 4 +
pom.xml | 361 ++++++---------
.../aspectj/bank/SecureBankServiceTest.java | 28 +-
samples/guice/pom.xml | 32 +-
.../samples/guice/SampleShiroGuiceBootstrap.java | 4 +-
.../SampleShiroNativeSessionsServletModule.java | 4 +-
.../samples/guice/SampleShiroServletModule.java | 4 +-
samples/guice/src/main/resources/log4j2.xml | 2 +-
samples/guice/src/main/webapp/WEB-INF/web.xml | 6 +-
samples/pom.xml | 20 +-
.../quickstart-guice/src/main/resources/log4j2.xml | 2 +-
samples/quickstart/src/main/resources/log4j2.xml | 2 +-
samples/servlet-plugin/pom.xml | 72 +--
.../servlet-plugin/src/main/resources/log4j2.xml | 2 +-
.../src/main/webapp/WEB-INF/shiro.ini | 1 +
.../servlet-plugin/src/main/webapp/WEB-INF/web.xml | 6 +-
samples/spring-boot-3-web/README.md | 18 -
samples/spring-boot-3-web/pom.xml | 170 -------
.../shiro/samples/AccountInfoController.java | 52 ---
.../org/apache/shiro/samples/HelloController.java | 61 ---
.../org/apache/shiro/samples/LoginController.java | 34 --
.../shiro/samples/RestrictedErrorController.java | 57 ---
.../main/java/org/apache/shiro/samples/WebApp.java | 98 -----
.../src/main/resources/META-INF/NOTICE | 15 -
.../src/main/resources/application.properties | 26 --
.../src/main/resources/templates/account-info.html | 39 --
.../src/main/resources/templates/error.html | 39 --
.../main/resources/templates/fragments/head.html | 58 ---
.../src/main/resources/templates/hello.html | 45 --
.../src/main/resources/templates/login.html | 93 ----
samples/spring-boot-web/README.md | 5 +-
samples/spring-boot-web/pom.xml | 74 ++--
.../org/apache/shiro/samples/HelloController.java | 6 +-
.../shiro/samples/RestrictedErrorController.java | 14 +-
.../main/java/org/apache/shiro/samples/WebApp.java | 4 +
.../src/main/resources/log4j2.properties | 0
.../src/main/resources/templates/account-info.html | 2 +-
.../src/main/resources/templates/error.html | 4 +-
.../src/main/resources/templates/hello.html | 2 +-
.../src/main/resources/templates/login.html | 2 +-
samples/spring-boot/pom.xml | 42 +-
.../java/org/apache/shiro/samples/QuickStart.java | 2 +-
samples/spring-hibernate/pom.xml | 57 ++-
.../samples/sprhib/dao/BootstrapDataPopulator.java | 11 -
.../shiro/samples/sprhib/dao/HibernateDao.java | 19 +-
.../shiro/samples/sprhib/dao/HibernateUserDAO.java | 13 +-
.../apache/shiro/samples/sprhib/model/Role.java | 21 +-
.../apache/shiro/samples/sprhib/model/User.java | 25 +-
.../samples/sprhib/web/CurrentUserInterceptor.java | 4 +-
.../samples/sprhib/web/EditUserValidator.java | 2 +-
.../shiro/samples/sprhib/web/LoginValidator.java | 2 +-
.../samples/sprhib/web/ManageUsersController.java | 7 +-
.../samples/sprhib/web/SecurityController.java | 7 +-
.../shiro/samples/sprhib/web/SignupController.java | 8 +-
.../shiro/samples/sprhib/web/SignupValidator.java | 2 +-
.../src/main/resources/ehcache.xml | 69 +--
.../src/main/webapp/WEB-INF/applicationContext.xml | 33 +-
.../src/main/webapp/WEB-INF/web.xml | 16 +-
samples/spring-mvc/pom.xml | 57 ++-
.../samples/spring/BootstrapDataPopulator.java | 42 +-
.../samples/spring/config/ApplicationConfig.java | 47 +-
.../spring/config/RemotingServletConfig.java | 46 --
.../config/ServletApplicationInitializer.java | 13 +-
.../samples/spring/realm/SaltAwareJdbcRealm.java | 4 +
.../shiro/samples/spring/web/IndexController.java | 7 +-
.../shiro/samples/spring/web/JnlpController.java | 12 +-
.../shiro/samples/spring/web/LoginController.java | 15 +-
.../shiro/samples/spring/web/LogoutController.java | 12 +-
.../samples/spring/web/RootRedirectController.java | 4 +-
samples/spring-mvc/src/main/resources/ehcache.xml | 54 +--
samples/spring/pom.xml | 9 +-
.../apache/shiro/samples/spring/QuickStart.java | 2 +-
samples/web-jakarta/pom.xml | 200 ---------
.../web-jakarta/src/main/resources/META-INF/NOTICE | 15 -
samples/web-jakarta/src/main/resources/log4j2.xml | 71 ---
.../web-jakarta/src/main/webapp/WEB-INF/shiro.ini | 62 ---
.../web-jakarta/src/main/webapp/WEB-INF/web.xml | 43 --
.../web-jakarta/src/main/webapp/account/index.jsp | 36 --
samples/web-jakarta/src/main/webapp/home.jsp | 69 ---
samples/web-jakarta/src/main/webapp/include.jsp | 22 -
samples/web-jakarta/src/main/webapp/index.jsp | 21 -
samples/web-jakarta/src/main/webapp/login.jsp | 110 -----
samples/web-jakarta/src/main/webapp/logout.jsp | 34 --
samples/web-jakarta/src/main/webapp/style.css | 47 --
samples/web/pom.xml | 182 +++++---
samples/web/src/main/resources/log4j2.xml | 2 +-
samples/web/src/main/webapp/WEB-INF/shiro.ini | 3 +
samples/web/src/main/webapp/WEB-INF/web.xml | 6 +-
.../shiro/test/WebAppContainerIntegrationIT.java | 59 ---
.../web/jakarta/JakartaAbstractContainerIT.java | 6 +-
.../shiro/test/web/jakarta/WebContainerIT.java | 26 +-
.../src/test/resources/log4j2.xml | 2 +-
shiro.doap.rdf | 14 +
src/suppressions.xml | 1 +
support/aspectj/pom.xml | 2 +-
.../org/apache/shiro/aspectj/DummyServiceTest.java | 18 +-
support/cdi/pom.xml | 31 +-
.../org/apache/shiro/cdi/AnnotatedTypeWrapper.java | 2 +-
.../main/java/org/apache/shiro/cdi/AopHelper.java | 6 +-
.../apache/shiro/cdi/ShiroComponentProducer.java | 8 +-
.../apache/shiro/cdi/ShiroSecureAnnotation.java | 2 +-
.../apache/shiro/cdi/ShiroSecurityExtension.java | 14 +-
.../apache/shiro/cdi/ShiroSecurityInterceptor.java | 12 +-
.../shiro/cdi/annotations/NoSessionCreation.java | 2 +-
.../apache/shiro/cdi/annotations/Principal.java | 2 +-
support/cdi/src/main/resources/META-INF/beans.xml | 6 +-
...ion => jakarta.enterprise.inject.spi.Extension} | 0
.../apache/shiro/cdi/AnnotatedTypeWrapperTest.java | 77 ++--
.../java/org/apache/shiro/cdi/AopHelperTest.java | 15 +-
support/ehcache/pom.xml | 86 ----
.../org/apache/shiro/cache/ehcache/EhCache.java | 255 -----------
.../apache/shiro/cache/ehcache/EhCacheManager.java | 249 -----------
.../apache/shiro/cache/ehcache/package-info.java | 23 -
support/ehcache/src/main/resources/META-INF/NOTICE | 15 -
.../org/apache/shiro/cache/ehcache/ehcache.xml | 97 ----
.../shiro/cache/ehcache/EhCacheManagerTest.java | 206 ---------
support/ehcache/src/test/resources/log4j2-test.xml | 62 ---
support/features/pom.xml | 86 ++--
support/features/src/main/resources/features.xml | 56 +--
support/guice/pom.xml | 25 +-
.../org/apache/shiro/guice/BeanTypeListener.java | 13 +-
.../shiro/guice/DestroyableInjectionListener.java | 3 +-
.../guice/InitializableInjectionListener.java | 1 +
.../apache/shiro/guice/LifecycleTypeListener.java | 2 +-
.../java/org/apache/shiro/guice/ShiroMatchers.java | 18 +-
.../java/org/apache/shiro/guice/ShiroModule.java | 2 +-
.../org/apache/shiro/guice/ShiroSessionScope.java | 8 +-
.../org/apache/shiro/guice/aop/ShiroAopModule.java | 12 +-
.../guice/web/FilterChainResolverProvider.java | 2 +-
.../apache/shiro/guice/web/GuiceShiroFilter.java | 2 +-
.../org/apache/shiro/guice/web/ShiroWebModule.java | 54 ++-
.../apache/shiro/guice/web/SimpleFilterChain.java | 10 +-
.../shiro/guice/web/SimpleFilterChainResolver.java | 8 +-
.../shiro/guice/web/WebGuiceEnvironment.java | 4 +-
.../apache/shiro/guice/BeanTypeListenerTest.java | 24 +-
.../guice/DestroyableInjectionListenerTest.java | 5 +-
.../apache/shiro/guice/GuiceEnvironmentTest.java | 6 +-
.../guice/InitializableInjectionListenerTest.java | 4 +-
.../org/apache/shiro/guice/ShiroMatchersTest.java | 10 +-
.../org/apache/shiro/guice/ShiroModuleTest.java | 26 +-
.../apache/shiro/guice/ShiroSessionScopeTest.java | 10 +-
.../AopAllianceMethodInterceptorAdapterTest.java | 4 +-
.../AopAllianceMethodInvocationAdapterTest.java | 10 +-
.../apache/shiro/guice/aop/ShiroAopModuleTest.java | 30 +-
.../guice/web/AbstractInjectionProviderTest.java | 33 +-
.../apache/shiro/guice/web/DefaultFiltersTest.java | 4 +-
.../guice/web/FilterChainResolverProviderTest.java | 24 +-
.../apache/shiro/guice/web/FilterConfigTest.java | 14 +-
.../shiro/guice/web/GuiceShiroFilterTest.java | 15 +-
.../guice/web/PathMatchingFilterProviderTest.java | 26 +-
.../apache/shiro/guice/web/ShiroWebModuleTest.java | 187 ++++----
.../guice/web/SimpleFilterChainResolverTest.java | 20 +-
.../shiro/guice/web/SimpleFilterChainTest.java | 8 +-
.../shiro/guice/web/WebGuiceEnvironmentTest.java | 46 +-
support/hazelcast/pom.xml | 89 ----
.../hazelcast/cache/HazelcastCacheManager.java | 246 -----------
.../apache/shiro/hazelcast/cache/package-info.java | 23 -
.../hazelcast/src/main/resources/META-INF/NOTICE | 15 -
.../cache/HazelcastCacheManagerTest.groovy | 156 -------
.../hazelcast/src/test/resources/log4j2-test.xml | 62 ---
support/jakarta-ee/pom.xml | 37 +-
.../apache/shiro/ee/cdi/ShiroFacesViewScoped.java | 4 +-
.../apache/shiro/ee/cdi/ShiroOmniViewScoped.java | 2 +-
.../org/apache/shiro/ee/cdi/ShiroScopeContext.java | 19 +-
.../shiro/ee/cdi/ShiroSessionScopeExtension.java | 22 +-
.../apache/shiro/ee/cdi/ShiroSessionScoped.java | 2 +-
.../shiro/ee/faces/tags/AuthenticatedTag.java | 2 +-
.../ee/faces/tags/AuthenticationTagHandler.java | 10 +-
.../org/apache/shiro/ee/faces/tags/GuestTag.java | 2 +-
.../shiro/ee/faces/tags/HasAnyPermissionTag.java | 2 +-
.../apache/shiro/ee/faces/tags/HasAnyRolesTag.java | 2 +-
.../shiro/ee/faces/tags/HasPermissionTag.java | 2 +-
.../org/apache/shiro/ee/faces/tags/HasRoleTag.java | 2 +-
.../shiro/ee/faces/tags/LacksPermissionTag.java | 2 +-
.../apache/shiro/ee/faces/tags/LacksRoleTag.java | 2 +-
.../shiro/ee/faces/tags/NotAuthenticatedTag.java | 2 +-
.../shiro/ee/faces/tags/PermissionTagHandler.java | 14 +-
.../apache/shiro/ee/faces/tags/PrincipalTag.java | 2 +-
.../apache/shiro/ee/faces/tags/RememberedTag.java | 2 +-
.../shiro/ee/faces/tags/SecureComponent.java | 4 +-
.../shiro/ee/faces/tags/SecureTagHandler.java | 4 +-
.../org/apache/shiro/ee/faces/tags/UserTag.java | 2 +-
.../ee/filters/AuthenticationFilterDelegate.java | 6 +-
.../shiro/ee/filters/FormAuthenticationFilter.java | 6 +-
.../shiro/ee/filters/FormResubmitSupport.java | 36 +-
.../ee/filters/FormResubmitSupportCookies.java | 8 +-
.../java/org/apache/shiro/ee/filters/Forms.java | 8 +-
.../org/apache/shiro/ee/filters/LogoutFilter.java | 6 +-
.../ee/filters/PassThruAuthenticationFilter.java | 4 +-
.../org/apache/shiro/ee/filters/ShiroFilter.java | 27 +-
.../org/apache/shiro/ee/filters/SslFilter.java | 6 +-
.../ee/listeners/EnvironmentLoaderListener.java | 10 +-
.../apache/shiro/ee/listeners/IniEnvironment.java | 2 +-
.../apache/shiro/ee/util/JakartaTransformer.java | 38 --
.../src/main/resources/META-INF/beans.xml | 6 +-
.../src/main/resources/META-INF/faces-config.xml | 6 +-
...ion => jakarta.enterprise.inject.spi.Extension} | 0
.../main/resources/META-INF/shiro-faces.taglib.xml | 6 +-
.../apache/shiro/ee/cdi/ShiroScopeContextTest.java | 31 +-
.../apache/shiro/ee/filters/FormSupportTest.java | 171 ++++---
support/jaxrs/pom.xml | 14 +-
.../web/jaxrs/AnnotationAuthorizationFilter.java | 10 +-
.../web/jaxrs/ShiroAnnotationFilterFeature.java | 14 +-
.../org/apache/shiro/web/jaxrs/ShiroFeature.java | 8 +-
.../shiro/web/jaxrs/ShiroSecurityContext.java | 4 +-
.../web/jaxrs/SubjectPrincipalRequestFilter.java | 10 +-
.../UnauthenticatedExceptionExceptionMapper.java | 6 +-
.../UnauthorizedExceptionExceptionMapper.java | 6 +-
.../web/jaxrs/ShiroSecurityContextTest.groovy | 4 +-
.../jaxrs/SubjectPrincipalRequestFilterTest.groovy | 4 +-
...UnauthorizedExceptionExceptionMapperTest.groovy | 4 +-
.../shiro/cache/jcache/JCacheManagerTest.groovy | 2 +-
support/pom.xml | 8 +-
support/quartz/pom.xml | 2 +-
.../src/main/resources/META-INF/web-fragment.xml | 6 +-
support/spring-boot/pom.xml | 88 +++-
support/spring-boot/spring-boot-starter/pom.xml | 9 -
.../ShiroAnnotationProcessorAutoConfiguration.java | 6 +-
.../autoconfigure/ShiroBeanAutoConfiguration.java | 22 +-
.../ShiroEnvironmentPostProcessor.java | 11 +-
.../autoconfigure/ShiroWebAutoConfiguration.java | 8 -
.../autoconfigure/ShiroWebFilterConfiguration.java | 11 +-
.../ShiroWebMvcAutoConfiguration.java | 3 -
.../src/main/resources/META-INF/spring.factories | 2 +-
.../ShiroSpringAutoConfigurationTest.groovy | 5 +-
.../web/ConfiguredGlobalFiltersTest.groovy | 3 +-
.../web/DisabledGlobalFiltersTest.groovy | 7 +-
.../web/ShiroWebSpringAutoConfigurationTest.groovy | 14 +-
.../src/test/resources/logback.xml | 4 +-
.../spring-boot/spring-boot-web-starter/pom.xml | 10 -
support/spring/pom.xml | 10 +-
.../shiro/spring/LifecycleBeanPostProcessor.java | 8 +-
.../spring/ShiroEventBusBeanPostProcessor.java | 19 +-
...tractShiroAnnotationProcessorConfiguration.java | 6 -
.../config/AbstractShiroBeanConfiguration.java | 42 --
.../ShiroAnnotationProcessorConfiguration.java | 5 +-
.../spring/config/ShiroBeanConfiguration.java | 21 +-
.../remoting/SecureRemoteInvocationExecutor.java | 124 ------
.../remoting/SecureRemoteInvocationFactory.java | 144 ------
.../apache/shiro/spring/remoting/package-info.java | 23 -
.../AuthorizationAttributeSourceAdvisor.java | 3 +-
.../shiro/spring/web/ShiroFilterFactoryBean.java | 117 +++--
.../web/ShiroFilterFactoryBeanPostProcessor.java | 76 ++++
.../shiro/spring/web/ShiroUrlPathHelper.java | 42 --
.../web/config/AbstractShiroWebConfiguration.java | 5 -
.../AbstractShiroWebFilterConfiguration.java | 30 +-
.../web/config/ShiroRequestMappingConfig.java | 33 --
.../spring/web/config/ShiroWebConfiguration.java | 7 -
.../web/config/ShiroWebFilterConfiguration.java | 9 +-
.../config/ShiroBeanConfigurationTest.groovy | 7 +-
.../spring/config/ShiroConfigurationTest.groovy | 12 +-
...oConfigurationWithOptionalComponentsTest.groovy | 7 +-
.../spring/config/ShiroWebConfigurationTest.groovy | 12 +-
.../config/ShiroWebFilterConfigurationTest.groovy | 19 +-
.../shiro/spring/web/ShiroUrlPathHelperTest.groovy | 46 --
.../web/config/ShiroWebConfigurationTest.groovy | 4 +-
.../ShiroWebConfigurationWithCacheTest.groovy | 4 +-
.../SecureRemoteInvocationFactoryTest.java | 120 -----
.../AbstractAuthorizationAnnotationTest.java | 23 +-
.../AuthorizationAttributeSourceAdvisorTest.java | 57 +--
.../DapcAuthorizationAnnotationTest.java | 17 +-
.../SchemaAuthorizationAnnotationTest.java | 9 +-
.../org/apache/shiro/spring/web/DummyFilter.java | 12 +-
.../spring/web/ShiroFilterFactoryBeanTest.java | 52 ++-
...> ShiroWebConfigurationSameSiteStrictTest.java} | 22 +-
support/spring/src/test/resources/log4j2-test.xml | 2 +-
.../spring/web/ShiroFilterFactoryBeanTest.xml | 5 +-
...oWebConfigurationSameSiteStrictTest.properties} | 0
test-coverage/pom.xml | 2 +-
tools/hasher/pom.xml | 2 +-
.../org/apache/shiro/tools/hasher/HasherTest.java | 15 +-
web/pom.xml | 26 +-
.../web/config/IniFilterChainResolverFactory.java | 28 +-
.../shiro/web/config/ShiroFilterConfiguration.java | 2 +-
.../web/config/WebIniSecurityManagerFactory.java | 3 +-
.../shiro/web/env/DefaultWebEnvironment.java | 2 +-
.../apache/shiro/web/env/EnvironmentLoader.java | 12 +-
.../shiro/web/env/EnvironmentLoaderListener.java | 6 +-
.../apache/shiro/web/env/IniWebEnvironment.java | 9 +-
.../shiro/web/env/MutableWebEnvironment.java | 2 +-
.../org/apache/shiro/web/env/WebEnvironment.java | 2 +-
.../shiro/web/filter/AccessControlFilter.java | 22 +-
.../shiro/web/filter/InvalidRequestFilter.java | 8 +-
.../shiro/web/filter/PathConfigProcessor.java | 2 +-
.../shiro/web/filter/PathMatchingFilter.java | 20 +-
.../shiro/web/filter/authc/AnonymousFilter.java | 4 +-
.../web/filter/authc/AuthenticatingFilter.java | 6 +-
.../web/filter/authc/AuthenticationFilter.java | 6 +-
.../authc/BasicHttpAuthenticationFilter.java | 17 +-
.../authc/BearerHttpAuthenticationFilter.java | 4 +-
.../web/filter/authc/FormAuthenticationFilter.java | 8 +-
.../web/filter/authc/HttpAuthenticationFilter.java | 10 +-
.../shiro/web/filter/authc/LogoutFilter.java | 16 +-
.../shiro/web/filter/authc/NoAccessFilter.java | 48 ++
.../filter/authc/PassThruAuthenticationFilter.java | 4 +-
.../apache/shiro/web/filter/authc/UserFilter.java | 14 +-
.../shiro/web/filter/authc/package-info.java | 2 +-
.../web/filter/authz/AuthorizationFilter.java | 12 +-
.../apache/shiro/web/filter/authz/HostFilter.java | 4 +-
.../filter/authz/HttpMethodPermissionFilter.java | 10 +-
.../apache/shiro/web/filter/authz/IpFilter.java | 4 +-
.../authz/PermissionsAuthorizationFilter.java | 4 +-
.../apache/shiro/web/filter/authz/PortFilter.java | 6 +-
.../web/filter/authz/RolesAuthorizationFilter.java | 4 +-
.../apache/shiro/web/filter/authz/SslFilter.java | 18 +-
.../shiro/web/filter/authz/package-info.java | 2 +-
.../apache/shiro/web/filter/mgt/DefaultFilter.java | 14 +-
.../web/filter/mgt/DefaultFilterChainManager.java | 33 +-
.../shiro/web/filter/mgt/FilterChainManager.java | 28 +-
.../shiro/web/filter/mgt/FilterChainResolver.java | 8 +-
.../shiro/web/filter/mgt/NamedFilterList.java | 4 +-
.../mgt/PathMatchingFilterChainResolver.java | 10 +-
.../web/filter/mgt/SimpleNamedFilterList.java | 4 +-
.../org/apache/shiro/web/filter/package-info.java | 2 +-
.../filter/session/NoSessionCreationFilter.java | 4 +-
.../shiro/web/mgt/CookieRememberMeManager.java | 6 +-
.../shiro/web/mgt/DefaultWebSecurityManager.java | 24 +-
.../web/mgt/DefaultWebSessionStorageEvaluator.java | 2 +-
.../shiro/web/mgt/DefaultWebSubjectFactory.java | 4 +-
.../apache/shiro/web/servlet/AbstractFilter.java | 16 +-
.../shiro/web/servlet/AbstractShiroFilter.java | 44 +-
.../org/apache/shiro/web/servlet/AdviceFilter.java | 34 +-
.../java/org/apache/shiro/web/servlet/Cookie.java | 4 +-
.../shiro/web/servlet/HttpSessionContext.java | 28 --
.../apache/shiro/web/servlet/IniShiroFilter.java | 4 +-
.../apache/shiro/web/servlet/NameableFilter.java | 10 +-
.../shiro/web/servlet/OncePerRequestFilter.java | 20 +-
.../shiro/web/servlet/ProxiedFilterChain.java | 10 +-
.../shiro/web/servlet/ServletContextSupport.java | 2 +-
.../shiro/web/servlet/ShiroHttpServletRequest.java | 23 +-
.../web/servlet/ShiroHttpServletResponse.java | 10 +-
.../apache/shiro/web/servlet/ShiroHttpSession.java | 43 +-
.../org/apache/shiro/web/servlet/SimpleCookie.java | 18 +-
.../shiro/web/session/HttpServletSession.java | 12 +-
.../web/session/mgt/DefaultWebSessionContext.java | 4 +-
.../web/session/mgt/DefaultWebSessionManager.java | 8 +-
.../mgt/ServletContainerSessionManager.java | 6 +-
.../shiro/web/session/mgt/WebSessionContext.java | 4 +-
.../shiro/web/session/mgt/WebSessionKey.java | 4 +-
.../org/apache/shiro/web/subject/WebSubject.java | 4 +-
.../shiro/web/subject/WebSubjectContext.java | 4 +-
.../subject/support/DefaultWebSubjectContext.java | 4 +-
.../web/subject/support/WebDelegatingSubject.java | 13 +-
.../apache/shiro/web/tags/AuthenticatedTag.java | 4 +-
.../java/org/apache/shiro/web/tags/GuestTag.java | 4 +-
.../apache/shiro/web/tags/NotAuthenticatedTag.java | 4 +-
.../org/apache/shiro/web/tags/PermissionTag.java | 4 +-
.../org/apache/shiro/web/tags/PrincipalTag.java | 7 +-
.../java/org/apache/shiro/web/tags/RoleTag.java | 4 +-
.../java/org/apache/shiro/web/tags/SecureTag.java | 4 +-
.../java/org/apache/shiro/web/tags/UserTag.java | 2 +-
.../java/org/apache/shiro/web/util/CorsUtils.java | 2 +-
.../org/apache/shiro/web/util/RedirectView.java | 24 +-
.../apache/shiro/web/util/RequestPairSource.java | 4 +-
.../org/apache/shiro/web/util/SavedRequest.java | 2 +-
.../java/org/apache/shiro/web/util/WebUtils.java | 51 ++-
.../IniFilterChainResolverFactoryTest.groovy | 6 +-
.../shiro/web/env/EnvironmentLoaderTest.groovy | 2 +-
.../apache/shiro/web/env/MockWebEnvironment.groovy | 2 +-
.../web/filter/InvalidRequestFilterTest.groovy | 7 +-
.../BearerHttpFilterAuthenticationTest.groovy | 14 +-
.../shiro/web/filter/authc/LogoutFilterTest.groovy | 8 +-
.../mgt/DefaultFilterChainManagerTest.groovy | 15 +-
.../session/NoSessionCreationFilterTest.groovy | 4 +-
.../DefaultWebSessionStorageEvaluatorTest.groovy | 4 +-
.../web/servlet/AbstractShiroFilterTest.groovy | 4 +-
.../shiro/web/servlet/IniShiroFilterTest.groovy | 6 +-
.../shiro/web/servlet/ShiroFilterTest.groovy | 4 +-
.../servlet/ShiroHttpServletResponseTest.groovy | 6 +-
.../mgt/DefaultWebSessionManagerTest.groovy | 6 +-
.../mgt/ServletContainerSessionManagerTest.groovy | 6 +-
.../apache/shiro/web/util/SavedRequestTest.groovy | 2 +-
.../org/apache/shiro/web/util/WebUtilsTest.groovy | 2 +-
.../test/java/org/apache/shiro/web/WebTest.java | 4 +-
.../config/WebIniSecurityManagerFactoryTest.java | 13 +-
.../web/env/EnvironmentLoaderServiceTest.java | 23 +-
.../java/org/apache/shiro/web/env/FilterStub.java | 12 +-
.../apache/shiro/web/env/WebEnvironmentStub.java | 2 +-
.../PathMatchingFilterParameterizedTest.java | 13 +-
.../shiro/web/filter/PathMatchingFilterTest.java | 21 +-
.../web/filter/authc/AnonymousFilterTest.java | 4 +-
.../authc/BasicHttpFilterAuthenticationTest.java | 5 +-
.../web/filter/authz/AuthorizationFilterTest.java | 8 +-
.../shiro/web/filter/authz/HostFilterTest.java | 6 +-
.../authz/HttpMethodPermissionFilterTest.java | 24 +-
.../web/filter/authz/IpAddressMatcherTests.java | 31 +-
.../shiro/web/filter/authz/IpFilterTest.java | 14 +-
.../shiro/web/filter/authz/PortFilterTest.java | 10 +-
.../shiro/web/filter/authz/SslFilterTest.java | 13 +-
.../mgt/PathMatchingFilterChainResolverTest.java | 71 ++-
.../web/filter/mgt/SimpleNamedFilterListTest.java | 92 ++--
.../shiro/web/mgt/CookieRememberMeManagerTest.java | 39 +-
.../web/mgt/DefaultWebSecurityManagerTest.java | 56 ++-
.../web/servlet/OncePerRequestFilterTest.java | 16 +-
.../web/servlet/ShiroHttpServletRequestTest.java | 15 +-
.../apache/shiro/web/servlet/SimpleCookieTest.java | 10 +-
.../shiro/web/session/HttpServletSessionTest.java | 8 +-
.../org/apache/shiro/web/util/CorsUtilsTest.java | 2 +-
web/src/test/resources/log4j2-test.xml | 2 +-
660 files changed, 5469 insertions(+), 10059 deletions(-)
create mode 100644 .mvn/maven.config
delete mode 100644 bom/pom.xml
delete mode 100644 core/src/main/java/org/apache/shiro/session/mgt/eis/RandomSessionIdGenerator.java
create mode 100644 core/src/main/java/org/apache/shiro/subject/ImmutablePrincipalCollection.java
copy core/src/main/java/org/apache/shiro/util/{OsgiDependencies.java => DefaultScopedValues.java} (77%)
delete mode 100644 core/src/main/java/org/apache/shiro/util/JavaEnvironment.java
create mode 100644 core/src/main/java/org/apache/shiro/util/ScopedValues.java
create mode 100644 core/src/main/java25/org/apache/shiro/util/DefaultScopedValues.java
create mode 100644 core/src/test/java/org/apache/shiro/subject/ImmutablePrincipalCollectionTest.java
rename integration-tests/{guice4 => guice}/pom.xml (81%)
rename integration-tests/{guice4 => guice}/src/main/java/org/apache/shiro/samples/guice/SampleShiroGuiceBootstrap.java (94%)
rename integration-tests/{guice4 => guice}/src/main/java/org/apache/shiro/samples/guice/SampleShiroServletModule.java (95%)
rename integration-tests/{guice4 => guice}/src/main/resources/log4j2.xml (94%)
rename integration-tests/{guice3 => guice}/src/main/webapp/WEB-INF/shiro.ini (100%)
rename integration-tests/{guice3 => guice}/src/main/webapp/WEB-INF/web.xml (88%)
rename integration-tests/{guice3 => guice}/src/main/webapp/account/index.jsp (100%)
rename integration-tests/{guice3 => guice}/src/main/webapp/home.jsp (100%)
rename integration-tests/{guice3 => guice}/src/main/webapp/include.jsp (100%)
rename integration-tests/{guice3 => guice}/src/main/webapp/index.jsp (100%)
rename integration-tests/{guice3 => guice}/src/main/webapp/login.jsp (100%)
rename integration-tests/{guice3 => guice}/src/main/webapp/style.css (100%)
rename integration-tests/{guice3 => guice}/src/test/java/org/apache/shiro/samples/guice/ContainerIntegrationIT.java (100%)
delete mode 100644 integration-tests/guice3/pom.xml
delete mode 100644 integration-tests/guice3/src/main/java/org/apache/shiro/samples/guice/SampleShiroGuiceBootstrap.java
delete mode 100644 integration-tests/guice3/src/main/java/org/apache/shiro/samples/guice/SampleShiroServletModule.java
delete mode 100644 integration-tests/guice3/src/main/resources/log4j2.xml
delete mode 100644 integration-tests/guice4/src/main/webapp/WEB-INF/shiro.ini
delete mode 100644 integration-tests/guice4/src/main/webapp/WEB-INF/web.xml
delete mode 100644 integration-tests/guice4/src/main/webapp/account/index.jsp
delete mode 100644 integration-tests/guice4/src/main/webapp/home.jsp
delete mode 100644 integration-tests/guice4/src/main/webapp/include.jsp
delete mode 100644 integration-tests/guice4/src/main/webapp/index.jsp
delete mode 100644 integration-tests/guice4/src/main/webapp/login.jsp
delete mode 100644 integration-tests/guice4/src/main/webapp/style.css
delete mode 100644 integration-tests/guice4/src/test/java/org/apache/shiro/samples/guice/ContainerIntegrationIT.java
copy {support => integration-tests}/jakarta-ee/src/main/resources/META-INF/beans.xml (84%)
delete mode 100644 lang/src/main/java/org/apache/shiro/lang/io/XmlSerializer.java
create mode 100644 lang/src/test/resources/test-data/file.json
delete mode 100644 samples/spring-boot-3-web/README.md
delete mode 100644 samples/spring-boot-3-web/pom.xml
delete mode 100644 samples/spring-boot-3-web/src/main/java/org/apache/shiro/samples/AccountInfoController.java
delete mode 100644 samples/spring-boot-3-web/src/main/java/org/apache/shiro/samples/HelloController.java
delete mode 100644 samples/spring-boot-3-web/src/main/java/org/apache/shiro/samples/LoginController.java
delete mode 100644 samples/spring-boot-3-web/src/main/java/org/apache/shiro/samples/RestrictedErrorController.java
delete mode 100644 samples/spring-boot-3-web/src/main/java/org/apache/shiro/samples/WebApp.java
delete mode 100644 samples/spring-boot-3-web/src/main/resources/META-INF/NOTICE
delete mode 100644 samples/spring-boot-3-web/src/main/resources/application.properties
delete mode 100644 samples/spring-boot-3-web/src/main/resources/templates/account-info.html
delete mode 100644 samples/spring-boot-3-web/src/main/resources/templates/error.html
delete mode 100644 samples/spring-boot-3-web/src/main/resources/templates/fragments/head.html
delete mode 100644 samples/spring-boot-3-web/src/main/resources/templates/hello.html
delete mode 100644 samples/spring-boot-3-web/src/main/resources/templates/login.html
rename samples/{spring-boot-3-web => spring-boot-web}/src/main/resources/log4j2.properties (100%)
delete mode 100644 samples/spring-mvc/src/main/java/org/apache/shiro/samples/spring/config/RemotingServletConfig.java
delete mode 100644 samples/web-jakarta/pom.xml
delete mode 100644 samples/web-jakarta/src/main/resources/META-INF/NOTICE
delete mode 100644 samples/web-jakarta/src/main/resources/log4j2.xml
delete mode 100644 samples/web-jakarta/src/main/webapp/WEB-INF/shiro.ini
delete mode 100644 samples/web-jakarta/src/main/webapp/WEB-INF/web.xml
delete mode 100644 samples/web-jakarta/src/main/webapp/account/index.jsp
delete mode 100644 samples/web-jakarta/src/main/webapp/home.jsp
delete mode 100644 samples/web-jakarta/src/main/webapp/include.jsp
delete mode 100644 samples/web-jakarta/src/main/webapp/index.jsp
delete mode 100644 samples/web-jakarta/src/main/webapp/login.jsp
delete mode 100644 samples/web-jakarta/src/main/webapp/logout.jsp
delete mode 100644 samples/web-jakarta/src/main/webapp/style.css
delete mode 100644 samples/web/src/test/java/org/apache/shiro/test/WebAppContainerIntegrationIT.java
rename samples/{web-jakarta => web}/src/test/java/org/apache/shiro/test/web/jakarta/JakartaAbstractContainerIT.java (91%)
rename samples/{web-jakarta => web}/src/test/java/org/apache/shiro/test/web/jakarta/WebContainerIT.java (80%)
rename samples/{web-jakarta => web}/src/test/resources/log4j2.xml (96%)
rename support/cdi/src/main/resources/META-INF/services/{javax.enterprise.inject.spi.Extension => jakarta.enterprise.inject.spi.Extension} (100%)
delete mode 100644 support/ehcache/pom.xml
delete mode 100644 support/ehcache/src/main/java/org/apache/shiro/cache/ehcache/EhCache.java
delete mode 100644 support/ehcache/src/main/java/org/apache/shiro/cache/ehcache/EhCacheManager.java
delete mode 100644 support/ehcache/src/main/java/org/apache/shiro/cache/ehcache/package-info.java
delete mode 100644 support/ehcache/src/main/resources/META-INF/NOTICE
delete mode 100644 support/ehcache/src/main/resources/org/apache/shiro/cache/ehcache/ehcache.xml
delete mode 100644 support/ehcache/src/test/java/org/apache/shiro/cache/ehcache/EhCacheManagerTest.java
delete mode 100644 support/ehcache/src/test/resources/log4j2-test.xml
delete mode 100644 support/hazelcast/pom.xml
delete mode 100644 support/hazelcast/src/main/java/org/apache/shiro/hazelcast/cache/HazelcastCacheManager.java
delete mode 100644 support/hazelcast/src/main/java/org/apache/shiro/hazelcast/cache/package-info.java
delete mode 100644 support/hazelcast/src/main/resources/META-INF/NOTICE
delete mode 100644 support/hazelcast/src/test/groovy/org/apache/shiro/hazelcast/cache/HazelcastCacheManagerTest.groovy
delete mode 100644 support/hazelcast/src/test/resources/log4j2-test.xml
delete mode 100644 support/jakarta-ee/src/main/java/org/apache/shiro/ee/util/JakartaTransformer.java
rename support/jakarta-ee/src/main/resources/META-INF/services/{javax.enterprise.inject.spi.Extension => jakarta.enterprise.inject.spi.Extension} (100%)
delete mode 100644 support/spring/src/main/java/org/apache/shiro/spring/config/AbstractShiroBeanConfiguration.java
delete mode 100644 support/spring/src/main/java/org/apache/shiro/spring/remoting/SecureRemoteInvocationExecutor.java
delete mode 100644 support/spring/src/main/java/org/apache/shiro/spring/remoting/SecureRemoteInvocationFactory.java
delete mode 100644 support/spring/src/main/java/org/apache/shiro/spring/remoting/package-info.java
create mode 100644 support/spring/src/main/java/org/apache/shiro/spring/web/ShiroFilterFactoryBeanPostProcessor.java
delete mode 100644 support/spring/src/main/java/org/apache/shiro/spring/web/ShiroUrlPathHelper.java
delete mode 100644 support/spring/src/main/java/org/apache/shiro/spring/web/config/ShiroRequestMappingConfig.java
delete mode 100644 support/spring/src/test/groovy/org/apache/shiro/spring/web/ShiroUrlPathHelperTest.groovy
delete mode 100644 support/spring/src/test/java/org/apache/shiro/spring/remoting/SecureRemoteInvocationFactoryTest.java
rename support/spring/src/test/java/org/apache/shiro/spring/web/config/{ShiroWebConfigurationTestSameSiteStrict.java => ShiroWebConfigurationSameSiteStrictTest.java} (60%)
rename support/spring/src/test/resources/org/apache/shiro/spring/web/config/{ShiroWebConfigurationTestSameSiteStrict.properties => ShiroWebConfigurationSameSiteStrictTest.properties} (100%)
create mode 100644 web/src/main/java/org/apache/shiro/web/filter/authc/NoAccessFilter.java
delete mode 100644 web/src/main/java/org/apache/shiro/web/servlet/HttpSessionContext.java