(shiro) branch 3.x updated (95c7e99c4 -> a366b224e)

[lp...@apache.org]

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 95c7e99c4 more pom cleanup
     add 1ceab51cc chore(build): put back jdk 25 for GH action matrix
     new a366b224e 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:
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(shiro) 01/01: Merge branch 'main' into 3.x

[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 a366b224e7f14a6ce76ca1e020ac9ca33b76861e
Merge: 95c7e99c4 1ceab51cc
Author: lprimak <le...@flowlogix.com>
AuthorDate: Wed Jan 28 13:42:09 2026 -0600

    Merge branch 'main' into 3.x

 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc .github/workflows/maven.yml
index 3065a5561,0b9c5039d..09dfbf7ee
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@@ -55,7 -55,7 +55,7 @@@ jobs
      strategy:
        matrix:
          os: [ 'ubuntu-latest', 'windows-2022', 'macOS-latest' ]
-         jdk: [ 17, 21 ]
 -        jdk: [ 11, 17, 21, 25 ]
++        jdk: [ 17, 21, 25 ]
          dist: [ 'temurin', 'adopt-openj9', 'zulu' ]
          exclude:
            # was already built