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:36 UTC

(shiro) 02/02: Merge remote-tracking branch 'upstream/3.x' into 3.x

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(-)