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 2024/09/06 06:09:15 UTC

(shiro) 01/01: 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 73733f8e2a9b24dccf252a6c1e8112030fc3f69a
Merge: 8d8985425 4c8eeec2e
Author: lprimak <le...@flowlogix.com>
AuthorDate: Fri Sep 6 01:08:08 2024 -0500

    Merge branch 'main' into 3.x

 .github/workflows/codeql.yml                 |  6 +--
 .github/workflows/maven.yml                  |  2 +-
 .github/workflows/scorecards.yml             |  4 +-
 README.md                                    |  2 +-
 integration-tests/jakarta-ee/pom.xml         | 12 ++---
 integration-tests/jaxrs/app/pom.xml          |  2 +-
 integration-tests/jaxrs/tests/pom.xml        |  1 +
 integration-tests/meecrowave-support/pom.xml |  2 +
 integration-tests/support/pom.xml            |  1 +
 pom.xml                                      | 67 +++++++++++++++++-----------
 samples/spring-boot-3-web/pom.xml            |  4 +-
 samples/web-jakarta/pom.xml                  |  2 +-
 src/site/site.xml                            | 18 ++++----
 support/jakarta-ee/pom.xml                   |  2 +-
 support/spring-boot/pom.xml                  | 19 ++++++++
 web/pom.xml                                  |  1 +
 16 files changed, 92 insertions(+), 53 deletions(-)