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 4479d4f684d156dffd7e359236a96097808c601b Merge: 29ac8399c c95a185e6 Author: lprimak <[email protected]> AuthorDate: Sat May 2 23:51:04 2026 -0500 Merge branch 'main' into 3.x .../shiro/session/mgt/DefaultSessionManager.java | 1 + .../ee/listeners/EnvironmentLoaderListener.java | 13 ++------- .../web/config/AbstractShiroWebConfiguration.java | 4 +-- .../shiro/web/mgt/CookieRememberMeManager.java | 32 ++-------------------- .../org/apache/shiro/web/servlet/SimpleCookie.java | 2 +- .../web/session/mgt/DefaultWebSessionManager.java | 3 ++ .../mgt/DefaultWebSessionManagerTest.groovy | 8 +++++- 7 files changed, 18 insertions(+), 45 deletions(-) diff --cc support/jakarta-ee/src/main/java/org/apache/shiro/ee/listeners/EnvironmentLoaderListener.java index 696dabb48,33cf25c4a..fa4b0a08f --- a/support/jakarta-ee/src/main/java/org/apache/shiro/ee/listeners/EnvironmentLoaderListener.java +++ b/support/jakarta-ee/src/main/java/org/apache/shiro/ee/listeners/EnvironmentLoaderListener.java @@@ -17,18 -17,15 +17,15 @@@ import java.nio.charset.Charset import java.nio.charset.StandardCharsets; import java.util.Optional; import java.util.Set; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; -import javax.servlet.SessionTrackingMode; -import javax.servlet.annotation.WebListener; +import jakarta.servlet.SessionTrackingMode; +import jakarta.servlet.annotation.WebListener; - import org.apache.shiro.SecurityUtils; - import org.apache.shiro.mgt.DefaultSecurityManager; import org.apache.shiro.web.env.EnvironmentLoader; import org.apache.shiro.web.env.WebEnvironment; - import org.apache.shiro.web.mgt.CookieRememberMeManager; import org.omnifaces.util.Faces; import static org.apache.shiro.ee.listeners.IniEnvironment.hasFacesContext; diff --cc web/src/main/java/org/apache/shiro/web/mgt/CookieRememberMeManager.java index 732cbb9aa,cc50bd95c..8f83b432d --- a/web/src/main/java/org/apache/shiro/web/mgt/CookieRememberMeManager.java +++ b/web/src/main/java/org/apache/shiro/web/mgt/CookieRememberMeManager.java @@@ -33,9 -33,10 +33,10 @@@ import org.apache.shiro.web.util.WebUti import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import static org.apache.shiro.session.mgt.DefaultSessionManager.SECURE_COOKIE_DISABLED; /**
