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 4f4001083279319b079be0a85757041fdc39c914
Merge: 07a65c9a9 dbad41af1
Author: lprimak <[email protected]>
AuthorDate: Tue May 26 20:18:59 2026 -0500

    Merge branch 'main' into 3.x

 .github/workflows/codeql.yml                 |  4 ++--
 .github/workflows/dependency-review.yml      |  2 +-
 .github/workflows/labeler.yml                |  2 +-
 .github/workflows/scorecards.yml             |  2 +-
 AGENTS.md                                    | 17 +++++++++++++++++
 SECURITY.md                                  | 14 ++++++++++++++
 integration-tests/meecrowave-support/pom.xml |  2 +-
 pom.xml                                      | 12 ++++++++----
 8 files changed, 45 insertions(+), 10 deletions(-)

diff --cc pom.xml
index 43817262a,f8172e257..08a2498b5
--- a/pom.xml
+++ b/pom.xml
@@@ -111,12 -115,12 +111,12 @@@
               modules' OSGi metadata: -->
          <quartz.version>2.5.2</quartz.version>
          <quartz.docs.version>2.3.0</quartz.docs.version>
-         <slf4j.version>2.0.17</slf4j.version>
-         <log4j.version>2.25.4</log4j.version>
+         <slf4j.version>2.0.18</slf4j.version>
+         <log4j.version>2.26.0</log4j.version>
 -        <spring.version>5.3.39</spring.version>
 -        <spring-boot.version>2.7.18</spring-boot.version>
 -        <guice.version>4.2.3</guice.version>
 -        <jaxrs.api.version>2.1.6</jaxrs.api.version>
 +        <spring.version>7.0.7</spring.version>
 +        <spring-boot.version>4.0.6</spring-boot.version>
 +        <guice.version>7.0.0</guice.version>
 +        <jaxrs.api.version>4.0.0</jaxrs.api.version>
          <htmlunit.version>4.21.0</htmlunit.version>
          <bouncycastle.version>1.84</bouncycastle.version>
  

Reply via email to