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/03/03 22:38:52 UTC
(shiro) branch 3.x updated (49285fd03 -> 196a9dbeb)
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 49285fd03 chore: dependency updates
add 98e38fe18 chore(deps): bump org.yaml:snakeyaml from 2.5 to 2.6 (#2607)
add 0f8f6e6f2 chore(deps): bump bytebuddy.version from 1.18.5 to 1.18.7 (#2604)
add 2e1c82e89 chore(deps): bump the github-dependencies group with 2 updates (#2603)
add 60e85c4d3 yamllint enable `document-start` rule checking (#2585)
add 57c8d0217 [#2578] Filter extra cookies on resubmit (#2588)
new 196a9dbeb Merge branch 'main' into 3.x
The 1 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:
.asf.yaml | 2 ++
.github/ISSUE_TEMPLATE/bug_report.yml | 1 +
.github/ISSUE_TEMPLATE/documentation_related.yml | 1 +
.github/ISSUE_TEMPLATE/enhancement_request.yml | 1 +
.github/ISSUE_TEMPLATE/feature_request.yml | 1 +
.github/ISSUE_TEMPLATE/question.yml | 1 +
.github/dependabot.yml | 1 +
.github/labeler.yml | 1 +
.github/linters/.markdown-lint.yml | 1 +
.github/workflows/codeql.yml | 6 ++++--
.github/workflows/dependency-review.yml | 1 +
.github/workflows/labeler.yml | 1 +
.github/workflows/maven.yml | 3 ++-
.github/workflows/pre-commit.yml | 1 +
.github/workflows/scorecards.yml | 5 +++--
.github/workflows/stale.yml | 1 +
.pre-commit-config.yaml | 1 +
jitpack.yml | 1 +
.../java/org/apache/shiro/ee/filters/FormResubmitSupport.java | 9 +++++----
.../org/apache/shiro/ee/filters/FormResubmitSupportCookies.java | 2 +-
20 files changed, 31 insertions(+), 10 deletions(-)
(shiro) 01/01: 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 196a9dbeb0fa337e3cdf14a20b104397dd98df84
Merge: 49285fd03 57c8d0217
Author: lprimak <le...@flowlogix.com>
AuthorDate: Tue Mar 3 16:38:41 2026 -0600
Merge branch 'main' into 3.x
.asf.yaml | 2 ++
.github/ISSUE_TEMPLATE/bug_report.yml | 1 +
.github/ISSUE_TEMPLATE/documentation_related.yml | 1 +
.github/ISSUE_TEMPLATE/enhancement_request.yml | 1 +
.github/ISSUE_TEMPLATE/feature_request.yml | 1 +
.github/ISSUE_TEMPLATE/question.yml | 1 +
.github/dependabot.yml | 1 +
.github/labeler.yml | 1 +
.github/linters/.markdown-lint.yml | 1 +
.github/workflows/codeql.yml | 6 ++++--
.github/workflows/dependency-review.yml | 1 +
.github/workflows/labeler.yml | 1 +
.github/workflows/maven.yml | 3 ++-
.github/workflows/pre-commit.yml | 1 +
.github/workflows/scorecards.yml | 5 +++--
.github/workflows/stale.yml | 1 +
.pre-commit-config.yaml | 1 +
jitpack.yml | 1 +
.../java/org/apache/shiro/ee/filters/FormResubmitSupport.java | 9 +++++----
.../org/apache/shiro/ee/filters/FormResubmitSupportCookies.java | 2 +-
20 files changed, 31 insertions(+), 10 deletions(-)
diff --cc support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/FormResubmitSupport.java
index 766ad2496,f2c3cdec7..e6ce773ef
--- 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
@@@ -52,13 -50,16 +52,14 @@@ import java.nio.charset.StandardCharset
import java.util.Optional;
import java.util.UUID;
import static java.util.function.Predicate.not;
+ import static org.apache.shiro.web.mgt.CookieRememberMeManager.DEFAULT_REMEMBER_ME_COOKIE_NAME;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-import static javax.faces.application.StateManager.STATE_SAVING_METHOD_CLIENT;
-import static javax.faces.application.StateManager.STATE_SAVING_METHOD_PARAM_NAME;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;