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 6d0c51b94ccb73a0766f917a840fd8cd9b85b8a6
Merge: 8a6026638 eed8ab006
Author: lprimak <[email protected]>
AuthorDate: Fri Jun 12 14:33:34 2026 -0500

    Merge branch 'main' into 3.x

 .editorconfig                             |  5 +++-
 .github/workflows/asf-allowlist-check.yml |  2 +-
 .github/workflows/codeql.yml              |  6 ++---
 .github/workflows/dependency-review.yml   |  2 +-
 .github/workflows/maven.yml               |  4 ++--
 .github/workflows/pre-commit-manual.yml   |  2 +-
 .github/workflows/pre-commit.yml          |  2 +-
 .github/workflows/scorecards.yml          |  4 ++--
 .pre-commit-config.yaml                   | 37 +++++++++++++---------------
 CITATION.cff                              | 11 ++++++++-
 pom.xml                                   | 12 +++++-----
 shiro.doap.rdf                            | 40 +++++++++++++++++++++++++++++++
 12 files changed, 88 insertions(+), 39 deletions(-)

diff --cc pom.xml
index f0071f35c,f085e74f1..4fbca6d79
--- a/pom.xml
+++ b/pom.xml
@@@ -123,13 -127,15 +123,13 @@@
          <!-- Test 3rd-party dependencies: -->
          <easymock.version>5.6.0</easymock.version>
          <mockito.version>5.23.0</mockito.version>
-         <bytebuddy.version>1.18.8</bytebuddy.version>
-         <gmaven.version>4.3.1</gmaven.version>
+         <bytebuddy.version>1.18.10</bytebuddy.version>
+         <gmaven.version>5.0.0</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.5</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.3.2.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.46</lombok.version>
  
          <maven.compiler.release>${jdk.version}</maven.compiler.release>

Reply via email to