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 00c9e45d4daa3a0246f8aa4b8b47be3487fa5a14 Merge: 8ed03dbbc 303c3c93f Author: lprimak <[email protected]> AuthorDate: Mon Mar 2 15:59:48 2026 -0600 Merge branch 'main' into 3.x .github/linters/.yaml-lint.yml => .codespellrc | 21 +--------- .github/labeler.yml | 46 +++++++++++----------- .github/linters/.yaml-lint.yml | 3 ++ .github/workflows/labeler.yml | 2 +- .github/workflows/maven.yml | 2 + .github/workflows/pre-commit.yml | 2 + .pre-commit-config.yaml | 19 ++++++++- .../apache/shiro/aspectj/SecuredDummyService.java | 2 +- 8 files changed, 52 insertions(+), 45 deletions(-) diff --cc .github/workflows/maven.yml index 687faed44,efed9636c..0c67761c0 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@@ -47,9 -47,10 +47,10 @@@ jobs run: ./mvnw apache-rat:check "-Drat.consoleOutput" - name: Build with Maven + # zizmor: ignore[template-injection] run: >- ./mvnw verify --show-version --errors --batch-mode --no-transfer-progress -Pdocs - -Pskip_jakarta_ee_tests -Dgh_user=${{ github.actor }} -Dgh_token=${{ secrets.GITHUB_TOKEN }} + -Dgh_user=${{ github.actor }} -Dgh_token=${{ secrets.GITHUB_TOKEN }} build-all: needs: build @@@ -93,7 -94,8 +94,8 @@@ distribution: ${{ matrix.dist }} - name: Build with Maven (Linux) - if: matrix.os == 'ubuntu-latest' && matrix.jdk <= 21 + if: matrix.os == 'ubuntu-latest' && matrix.jdk >= 21 + # zizmor: ignore[template-injection] run: >- ./mvnw verify --show-version --errors --batch-mode --no-transfer-progress -Dgh_user=${{ github.actor }} -Dgh_token=${{ secrets.GITHUB_TOKEN }}
