You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lp...@apache.org on 2026/02/22 18:08:34 UTC
(shiro) branch 3.x updated (4c058a2f7 -> 8ad6b8428)
This is an automated email from the ASF dual-hosted git repository.
lprimak pushed a change to branch 3.x
in repository https://gitbox.apache.org/repos/asf/shiro.git
from 4c058a2f7 [#1862] [3.0] Support for JDK 25 scoped values (#2485)
add 954c31e3d [#2488] chore: add .gitattributes file for line ending normalization and file⦠(#2574)
new 69617bf5c Merge branch 'main' into 3.x
new 8ad6b8428 Merge remote-tracking branch 'upstream/3.x' into 3.x
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...oryTest.propsRealm.properties => .gitattributes | 68 +++++++++++++++++-----
src/checkstyle.xml | 2 +-
2 files changed, 56 insertions(+), 14 deletions(-)
copy core/src/test/resources/org/apache/shiro/config/IniSecurityManagerFactoryTest.propsRealm.properties => .gitattributes (51%)
(shiro) 01/02: Merge branch 'main' into 3.x
Posted by lp...@apache.org.
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 69617bf5cc5e343652a3174bd760fcc6b718ac88
Merge: 5b1ce8659 954c31e3d
Author: lprimak <le...@flowlogix.com>
AuthorDate: Sun Feb 22 12:07:25 2026 -0600
Merge branch 'main' into 3.x
.gitattributes | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/checkstyle.xml | 2 +-
2 files changed, 73 insertions(+), 1 deletion(-)
(shiro) 02/02: Merge remote-tracking branch 'upstream/3.x' into 3.x
Posted by lp...@apache.org.
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 8ad6b8428b0c99934027f8cf8f0894681ea5a2f0
Merge: 69617bf5c 4c058a2f7
Author: lprimak <le...@flowlogix.com>
AuthorDate: Sun Feb 22 12:08:12 2026 -0600
Merge remote-tracking branch 'upstream/3.x' into 3.x
.../main/java/org/apache/shiro/SecurityUtils.java | 14 +-
.../java/org/apache/shiro/subject/Subject.java | 39 +++--
.../shiro/subject/support/SubjectCallable.java | 19 ++-
.../shiro/subject/support/SubjectRunnable.java | 20 ++-
.../shiro/subject/support/SubjectThreadState.java | 21 ++-
.../org/apache/shiro/util/DefaultScopedValues.java | 29 ++++
.../org/apache/shiro/util/JavaEnvironment.java | 181 ---------------------
.../java/org/apache/shiro/util/ScopedValues.java | 55 +++++++
.../org/apache/shiro/util/DefaultScopedValues.java | 60 +++++++
.../apache/shiro/testing/jaxrs/WhoamiResource.java | 16 +-
.../org/apache/shiro/guice/ShiroSessionScope.java | 8 +-
.../org/apache/shiro/ee/filters/ShiroFilter.java | 4 +-
12 files changed, 244 insertions(+), 222 deletions(-)