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 3ed50523195ffb348b26754c952c0ccd78c70f37
Merge: 561ed3310 be31c133e
Author: lprimak <[email protected]>
AuthorDate: Wed May 6 17:22:35 2026 -0500

    Merge branch 'main' into 3.x

 .../shiro/mgt/AbstractRememberMeManager.java       |  1 -
 .../shiro/ee/filters/FormResubmitSupport.java      | 52 +++++++++++++++++-----
 .../ee/filters/FormResubmitSupportCookies.java     |  3 +-
 3 files changed, 44 insertions(+), 12 deletions(-)

diff --cc 
support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/FormResubmitSupport.java
index f4ef06964,0e4732eff..695165a72
--- 
a/support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/FormResubmitSupport.java
+++ 
b/support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/FormResubmitSupport.java
@@@ -70,6 -72,8 +72,7 @@@ import lombok.SneakyThrows
  import lombok.ToString;
  import lombok.extern.slf4j.Slf4j;
  import org.apache.shiro.SecurityUtils;
 -import static org.apache.shiro.ee.util.JakartaTransformer.jakartify;
+ import org.apache.shiro.lang.codec.Base64;
  import org.apache.shiro.mgt.AbstractRememberMeManager;
  import org.apache.shiro.mgt.DefaultSecurityManager;
  import org.apache.shiro.mgt.SecurityManager;

Reply via email to