Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions .jenkins.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
*/

def deployableBranch = env.BRANCH_NAME ==~ /(1.12.x|1.11.x|1.10.x|main)/
def builtinVersion = '999-SNAPSHOT'
def nextVersion

pipeline {

Expand Down Expand Up @@ -83,6 +85,34 @@ pipeline {
}
}

stage('Use next -SNAPSHOT version') {
when {
expression { deployableBranch }
expression { MATRIX_JDK == 'jdk_11_latest' }
// is not a PR (GitHub) / MergeRequest (GitLab) / Change (Gerrit)?
not { changeRequest() }
}
steps {
echo 'Setting next -SNAPSHOT version'
script {
def latestRelease = sh(script: """
curl -sf https://repo1.maven.org/maven2/org/apache/shiro/shiro-root/maven-metadata.xml \
| xmllint --xpath '//metadata/versioning/latest/text()' - 2>/dev/null || echo '$builtinVersion'
""", returnStdout: true
).trim()

def parts = latestRelease.tokenize('.')
def nextPatch = parts[2].toInteger() + 1
nextVersion = "${parts[0]}.${parts[1]}.${nextPatch}-SNAPSHOT"

echo "Latest release: ${latestRelease}, next SNAPSHOT: ${nextVersion}"
}

sh "./mvnw -B versions:set -DprocessAllModules=true -DgenerateBackupPoms=false \
-DoldVersion=${builtinVersion} -DnewVersion=${nextVersion}"
}
}

stage('License check') {
steps {
echo 'License check'
Expand Down
2 changes: 1 addition & 1 deletion bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>shiro-root</artifactId>
<groupId>org.apache.shiro</groupId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion cache/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion config/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-config</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion config/ogdl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-config</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<artifactId>shiro-config</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion crypto/cipher/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-crypto</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion crypto/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-crypto</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion crypto/hash/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-crypto</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion crypto/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<artifactId>shiro-crypto</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion crypto/support/hashes/argon2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.shiro.crypto</groupId>
<artifactId>shiro-crypto-support</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion crypto/support/hashes/bcrypt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.shiro.crypto</groupId>
<artifactId>shiro-crypto-support</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion crypto/support/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-crypto</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<groupId>org.apache.shiro.crypto</groupId>
Expand Down
2 changes: 1 addition & 1 deletion event/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/guice3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.shiro.integrationtests</groupId>
<artifactId>shiro-integration-tests</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<artifactId>shiro-its-guice3</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/guice4/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.shiro.integrationtests</groupId>
<artifactId>shiro-integration-tests</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<artifactId>shiro-its-guice4</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/jakarta-ee-support/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.shiro.integrationtests</groupId>
<artifactId>jakarta-ee-support</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
<name>Apache Shiro :: ITs :: Jakarta EE Support</name>
<packaging>pom</packaging>

<parent>
<groupId>org.apache.shiro.integrationtests</groupId>
<artifactId>shiro-integration-tests</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<build>
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/jakarta-ee/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.shiro.integrationtests</groupId>
<artifactId>shiro-its-jakarta-ee</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
<packaging>war</packaging>
<name>Apache Shiro :: ITs :: Jakarta EE</name>

<parent>
<groupId>org.apache.shiro.integrationtests</groupId>
<artifactId>shiro-integration-tests</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/jaxrs/app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
<parent>
<groupId>org.apache.shiro.integrationtests.jaxrs</groupId>
<artifactId>shiro-its-jaxrs</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<artifactId>shiro-its-jaxrs-app</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
<name>Apache Shiro :: ITs :: JAX-RS :: App</name>
<packaging>war</packaging>

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/jaxrs/meecrowave/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.shiro.integrationtests.jaxrs</groupId>
<artifactId>shiro-its-jaxrs</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<artifactId>shiro-its-jaxrs-meecrowave</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/jaxrs/openliberty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.shiro.integrationtests.jaxrs</groupId>
<artifactId>shiro-its-jaxrs</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<artifactId>shiro-its-jaxrs-openliberty</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/jaxrs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.shiro.integrationtests</groupId>
<artifactId>shiro-integration-tests</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<groupId>org.apache.shiro.integrationtests.jaxrs</groupId>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/jaxrs/tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.shiro.integrationtests.jaxrs</groupId>
<artifactId>shiro-its-jaxrs</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<artifactId>shiro-its-jaxrs-tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/meecrowave-support/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<artifactId>shiro-integration-tests</artifactId>
<groupId>org.apache.shiro.integrationtests</groupId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<artifactId>shiro-its-meecrowave-support</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<groupId>org.apache.shiro.integrationtests</groupId>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/support/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.shiro.integrationtests</groupId>
<artifactId>shiro-integration-tests</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<artifactId>shiro-its-support</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion lang/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<packaging>pom</packaging>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>

<name>Apache Shiro</name>
<url>https://shiro.apache.org/</url>
Expand Down Expand Up @@ -69,7 +69,7 @@
<shiro.previousVersion>2.0.0</shiro.previousVersion>
<!-- Replaced by the build number plugin at build time: -->
<buildNumber>${user.name}-${maven.build.timestamp}</buildNumber>
<project.build.outputTimestamp>2025-11-18T02:53:12Z</project.build.outputTimestamp>
<project.build.outputTimestamp>2026-01-15T21:40:21Z</project.build.outputTimestamp>
<jacoco.skip>true</jacoco.skip>
<!--suppress CheckTagEmptyBody -->
<surefire.argLine/>
Expand Down
2 changes: 1 addition & 1 deletion samples/aspectj/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion samples/guice/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion samples/quickstart-guice/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion samples/quickstart/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion samples/servlet-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion samples/spring-boot-3-web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<artifactId>samples-spring-boot-3-web</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion samples/spring-boot-web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
<version>2.0.7-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<artifactId>samples-spring-boot-web</artifactId>
Expand Down
Loading