This is an automated email from the ASF dual-hosted git repository. lprimak pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/shiro.git
commit d2165e07d71f5bd8c341d2784d357ed90c8003e1 Author: lprimak <[email protected]> AuthorDate: Tue Jan 27 18:32:47 2026 -0600 chore(build): bump Maven version to 3.9.12 chore(build): deploy using latest JDK (25), deploy 3.x SNAPSHOT release, speed up builds and deployment by not cleaning every time --- .jenkins.groovy | 16 ++++++++++------ .mvn/wrapper/maven-wrapper.properties | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.jenkins.groovy b/.jenkins.groovy index b90c80634..e5ed97b50 100644 --- a/.jenkins.groovy +++ b/.jenkins.groovy @@ -17,7 +17,8 @@ * under the License. */ -def deployableBranch = env.BRANCH_NAME ==~ /(1.12.x|1.11.x|1.10.x|main)/ +def deployableBranch = env.BRANCH_NAME ==~ /(1.12.x|1.11.x|1.10.x|main|3.x)/ +def latestSupportedJDK = 'jdk_25_latest' def builtinVersion = '999-SNAPSHOT' def nextVersion @@ -38,7 +39,7 @@ pipeline { axis { // https://cwiki.apache.org/confluence/display/INFRA/JDK+Installation+Matrix name 'MATRIX_JDK' - values 'jdk_11_latest', 'jdk_17_latest', 'jdk_21_latest', 'jdk_25_latest' + values 'jdk_11_latest', 'jdk_17_latest', 'jdk_21_latest', latestSupportedJDK } // Additional axes, like OS and maven version can be configured here. } @@ -88,7 +89,7 @@ pipeline { stage('Use next -SNAPSHOT version') { when { expression { deployableBranch } - expression { MATRIX_JDK == 'jdk_11_latest' } + expression { MATRIX_JDK == 'jdk_25_latest' } // is not a PR (GitHub) / MergeRequest (GitLab) / Change (Gerrit)? not { changeRequest() } } @@ -104,6 +105,9 @@ pipeline { def parts = latestRelease.tokenize('.') def nextPatch = parts[2].toInteger() + 1 nextVersion = "${parts[0]}.${parts[1]}.${nextPatch}-SNAPSHOT" + if (env.BRANCH_NAME == '3.x') { + nextVersion = '3.0.0-SNAPSHOT' + } echo "Latest release: ${latestRelease}, next SNAPSHOT: ${nextVersion}" } @@ -123,7 +127,7 @@ pipeline { stage('Build') { steps { echo 'Building' - sh './mvnw clean verify --show-version --errors --batch-mode --no-transfer-progress -Pdocs \ + sh './mvnw verify --show-version --errors --batch-mode --no-transfer-progress \ -Dmaven.test.failure.ignore=true -Pskip_jakarta_ee_tests' } post { @@ -139,14 +143,14 @@ pipeline { when { allOf { expression { deployableBranch } - expression { MATRIX_JDK == 'jdk_11_latest' } + expression { MATRIX_JDK == latestSupportedJDK } // is not a PR (GitHub) / MergeRequest (GitLab) / Change (Gerrit)? not { changeRequest() } } } steps { echo 'Deploying' - sh './mvnw --batch-mode clean deploy -Pdocs -DskipTests -DskipITs' + sh './mvnw --batch-mode deploy -Pdocs -DskipTests -DskipITs' } } diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index c0bcafe98..8dea6c227 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,3 +1,3 @@ wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
