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 83540ec0cda9d900b3b8c6040d846a5b8549e062 Merge: b1a7b8fee 7d0b64ce6 Author: lprimak <[email protected]> AuthorDate: Tue Jan 27 20:04:28 2026 -0600 Merge branch 'main' into 3.x .github/workflows/codeql.yml | 8 ++++---- .github/workflows/dependency-review.yml | 2 +- .github/workflows/maven.yml | 28 ++++++++++++++-------------- .github/workflows/pre-commit.yml | 6 +++--- .github/workflows/scorecards.yml | 4 ++-- .jenkins.groovy | 18 +++++++++++------- .mvn/wrapper/maven-wrapper.properties | 2 +- pom.xml | 12 ++++++------ support/servlet-plugin/pom.xml | 2 +- 9 files changed, 43 insertions(+), 39 deletions(-) diff --cc .github/workflows/maven.yml index 1e4804e2e,cdee1af44..57109b3a5 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@@ -23,9 -23,9 +23,9 @@@ permissions on: workflow_dispatch: { } push: -- branches: [ main, '1.13.x', '1.12.x', '1.11.x', '1.10.x' ] ++ branches: [ main, '3.x'] pull_request: -- branches: [ main, '1.13.x', '1.12.x', '1.11.x', '1.10.x' ] ++ branches: [ main ] jobs: build: @@@ -55,7 -55,7 +55,7 @@@ strategy: matrix: os: [ 'ubuntu-latest', 'windows-2022', 'macOS-latest' ] - jdk: [ 11, 17, 21, 25 ] - jdk: [ 11, 17, 21 ] ++ jdk: [ 17, 21 ] dist: [ 'temurin', 'adopt-openj9', 'zulu' ] exclude: # was already built @@@ -89,15 -89,15 +89,15 @@@ distribution: ${{ matrix.dist }} - name: Build with Maven (Linux) - if: matrix.os == 'ubuntu-latest' && matrix.jdk <= 17 - if: matrix.os == 'ubuntu-latest' && matrix.jdk <= 21 ++ if: matrix.os == 'ubuntu-latest' run: >- - ./mvnw verify --show-version --errors --batch-mode --no-transfer-progress -Pdocs + ./mvnw verify --show-version --errors --batch-mode --no-transfer-progress -Dgh_user=${{ github.actor }} -Dgh_token=${{ secrets.GITHUB_TOKEN }} - - name: Build with Maven (non-Linux or JDK > 17) - if: matrix.os != 'ubuntu-latest' || matrix.jdk > 17 - - name: Build with Maven (non-Linux or JDK > 21) - if: matrix.os != 'ubuntu-latest' || matrix.jdk > 21 ++ - name: Build with Maven (non-Linux) ++ if: matrix.os != 'ubuntu-latest' run: >- - ./mvnw verify --show-version --errors --batch-mode --no-transfer-progress -Pdocs + ./mvnw verify --show-version --errors --batch-mode --no-transfer-progress -Pskip_jakarta_ee_tests - name: Archive test run logs diff --cc .jenkins.groovy index 7b601f5ed,d871c4940..828febcd3 --- a/.jenkins.groovy +++ b/.jenkins.groovy @@@ -38,7 -39,7 +39,7 @@@ pipeline axis { // https://cwiki.apache.org/confluence/display/INFRA/JDK+Installation+Matrix name 'MATRIX_JDK' - values 'jdk_17_latest', 'jdk_21_latest', 'jdk_25_latest' - values 'jdk_25_latest', 'jdk_11_latest', 'jdk_17_latest', 'jdk_21_latest' ++ values 'jdk_25_latest', 'jdk_17_latest', 'jdk_21_latest' } // Additional axes, like OS and maven version can be configured here. } @@@ -88,7 -89,7 +89,7 @@@ stage('Use next -SNAPSHOT version') { when { expression { deployableBranch } - expression { MATRIX_JDK == 'jdk_17_latest' } - expression { MATRIX_JDK == 'jdk_25_latest' } ++ expression { MATRIX_JDK == latestSupportedJDK } // is not a PR (GitHub) / MergeRequest (GitLab) / Change (Gerrit)? not { changeRequest() } } @@@ -123,8 -127,8 +127,8 @@@ stage('Build') { steps { echo 'Building' - sh './mvnw clean verify --show-version --errors --batch-mode --no-transfer-progress -Pdocs \ - -Dmaven.test.failure.ignore=true -Pskip_jakarta_ee_tests -Dmaven.compiler.release=17 -Djapicmp.skip=true' + sh './mvnw verify --show-version --errors --batch-mode --no-transfer-progress \ - -Dmaven.test.failure.ignore=true -Pskip_jakarta_ee_tests' ++ -Dmaven.test.failure.ignore=true -Pskip_jakarta_ee_tests -Djdk.version=17 -Djapicmp.skip=true' } post { always { diff --cc pom.xml index 55101eba4,bb497b7a5..9441b05a4 --- a/pom.xml +++ b/pom.xml @@@ -124,13 -123,13 +124,13 @@@ <easymock.version>5.6.0</easymock.version> <mockito.version>5.21.0</mockito.version> <bytebuddy.version>1.18.4</bytebuddy.version> - <gmaven.version>4.2.1</gmaven.version> + <gmaven.version>4.3.0</gmaven.version> - <groovy.version>4.0.27</groovy.version> - <junit.version>5.13.4</junit.version> + <groovy.version>5.0.3</groovy.version> + <junit.version>6.0.2</junit.version> <junit.server.jetty.version>3.4.0</junit.server.jetty.version> - <hibernate.version>5.6.15.Final</hibernate.version> + <hibernate.version>7.2.1.Final</hibernate.version> <taglibs.standard.version>1.2.5</taglibs.standard.version> - <jakarta.annotations.version>1.3.5</jakarta.annotations.version> + <jakarta.annotations.version>2.1.1</jakarta.annotations.version> <lombok.version>1.18.42</lombok.version> <maven.compiler.release>${jdk.version}</maven.compiler.release>
