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/04/08 18:50:17 UTC
(shiro) 01/02: Merge branch 'main' 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 5bf1d71722cd44a594b57fdcf582925af829dde4
Merge: 68f0e6beb eecdd87ca
Author: lprimak <le...@flowlogix.com>
AuthorDate: Wed Apr 8 13:46:43 2026 -0500
Merge branch 'main' into 3.x
.github/workflows/codeql.yml | 4 ++--
.github/workflows/scorecards.yml | 2 +-
.pre-commit-config.yaml | 2 +-
pom.xml | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --cc pom.xml
index bbec52e18,3ed944e75..49594663f
--- a/pom.xml
+++ b/pom.xml
@@@ -112,24 -116,26 +112,24 @@@
<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.3</log4j.version>
+ <log4j.version>2.25.4</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.5</spring.version>
+ <spring-boot.version>4.0.2</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.82</bouncycastle.version>
+ <bouncycastle.version>1.83</bouncycastle.version>
<!-- Test 3rd-party dependencies: -->
<easymock.version>5.6.0</easymock.version>
<mockito.version>5.23.0</mockito.version>
- <bytebuddy.version>1.18.7</bytebuddy.version>
+ <bytebuddy.version>1.18.8</bytebuddy.version>
<gmaven.version>4.3.1</gmaven.version>
- <groovy.version>4.0.27</groovy.version>
- <junit.version>5.13.4</junit.version>
- <junit.engine.version>1.13.4</junit.engine.version>
+ <groovy.version>5.0.4</groovy.version>
+ <junit.version>6.0.3</junit.version>
<junit.server.jetty.version>3.5.0</junit.server.jetty.version>
- <hibernate.version>5.6.15.Final</hibernate.version>
+ <hibernate.version>7.2.6.Final</hibernate.version>
<taglibs.standard.version>1.2.5</taglibs.standard.version>
- <jakarta.annotations.version>1.3.5</jakarta.annotations.version>
<lombok.version>1.18.44</lombok.version>
<maven.compiler.release>${jdk.version}</maven.compiler.release>