Skip to content

Commit b381172

Browse files
committed
chore: additional and supporting updates
1 parent 592f9b0 commit b381172

60 files changed

Lines changed: 21 additions & 3743 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.jenkins.groovy

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
def deployableBranch = env.BRANCH_NAME ==~ /(1.13.x|2.x|3.x|4.x|main)/
20+
def deployableBranch = env.BRANCH_NAME ==~ /(main|4.x)/
2121
def latestSupportedJDK = 'jdk_25_latest'
2222
def builtinVersion = '999-SNAPSHOT'
2323
def nextVersion
@@ -107,10 +107,9 @@ pipeline {
107107
def parts = latestRelease.tokenize('.')
108108
def nextPatch = parts[2].toInteger() + 1
109109
nextVersion = "${parts[0]}.${parts[1]}.${nextPatch}-SNAPSHOT"
110-
if (env.BRANCH_NAME == '2.x') {
111-
nextVersion = '2.0.0-SNAPSHOT'
112-
}
113-
if (env.BRANCH_NAME == '3.x') {
110+
if (env.BRANCH_NAME == '4.x') {
111+
nextVersion = '4.0.0-SNAPSHOT'
112+
} else if (parts[0].toInteger() < 3) {
114113
nextVersion = '3.0.0-SNAPSHOT'
115114
}
116115

3.X-NOTES

Lines changed: 0 additions & 27 deletions
This file was deleted.

core/src/main/java/org/apache/shiro/session/mgt/eis/RandomSessionIdGenerator.java

Lines changed: 0 additions & 72 deletions
This file was deleted.

core/src/main/java/org/apache/shiro/util/JavaEnvironment.java

Lines changed: 0 additions & 181 deletions
This file was deleted.

integration-tests/guice/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
<version>999-SNAPSHOT</version>
2828
</parent>
2929

30-
<artifactId>shiro-its-guice</artifactId>
31-
<name>Apache Shiro :: ITs :: Guice</name>
32-
<packaging>war</packaging>
30+
<artifactId>shiro-its-guice</artifactId>
31+
<name>Apache Shiro :: ITs :: Guice</name>
32+
<packaging>war</packaging>
3333

3434
<properties>
3535
<groups>none()</groups>

0 commit comments

Comments
 (0)