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 d219013267fa4feeeacd65265d897986d3f3a458 Merge: ed92e3f17 b1eca1d23 Author: lprimak <[email protected]> AuthorDate: Wed Mar 11 09:12:45 2026 -0500 Merge branch 'main' into 3.x .github/dependabot.yml | 10 ++++++++++ .github/linters/mlc_config.json | 3 +++ .github/workflows/codeql.yml | 4 ++-- .github/workflows/scorecards.yml | 2 +- .pre-commit-config.yaml | 8 ++++---- pom.xml | 16 ++-------------- support/features/pom.xml | 2 +- 7 files changed, 23 insertions(+), 22 deletions(-) diff --cc pom.xml index 8094beadd,a59dc2813..e77825387 --- a/pom.xml +++ b/pom.xml @@@ -98,14 -96,20 +98,14 @@@ <commons.collection.version>3.2.2</commons.collection.version> <commons.configuration2.version>2.13.0</commons.configuration2.version> <commons.lang3.version>3.20.0</commons.lang3.version> - <commons.logging.version>1.3.5</commons.logging.version> + <commons.logging.version>1.3.6</commons.logging.version> <commons.text.version>1.8</commons.text.version> - <!-- Don't change this version without also changing the shiro-ehcache and shiro-features - modules' OSGi metadata: --> - <ehcache.version>2.6.11</ehcache.version> - <!-- Don't change this version without also changing the shiro-hazelcast and shiro-features OSGi metadata: --> - <hazelcast.version>5.3.8</hazelcast.version> <hsqldb.version>2.7.4</hsqldb.version> - <javax.annotation.api.version>1.3.2</javax.annotation.api.version> <jcache.api.version>1.1.1</jcache.api.version> - <jdk.version>11</jdk.version> - <jetty.version>9.4.58.v20250814</jetty.version> - <tomcat.version>9.0.113</tomcat.version> - <tomcat10.version>10.1.50</tomcat10.version> + <jdk.version>17</jdk.version> + <tomcat.version>11.0.18</tomcat.version> + <jakarta.ee.version>11.0.0</jakarta.ee.version> + <jetty.version>12.1.6</jetty.version> <owasp.java.encoder.version>1.4.0</owasp.java.encoder.version> <!-- Don't change this version without also changing the shiro-quartz and shiro-features modules' OSGi metadata: --> @@@ -125,12 -129,14 +125,12 @@@ <mockito.version>5.22.0</mockito.version> <bytebuddy.version>1.18.7</bytebuddy.version> <gmaven.version>4.3.1</gmaven.version> - <groovy.version>4.0.27</groovy.version> - <junit.version>5.13.4</junit.version> - <junit.engine.version>1.13.4</junit.engine.version> + <groovy.version>5.0.4</groovy.version> + <junit.version>6.0.3</junit.version> <junit.server.jetty.version>3.5.0</junit.server.jetty.version> - <hibernate.version>5.6.15.Final</hibernate.version> + <hibernate.version>7.2.6.Final</hibernate.version> <taglibs.standard.version>1.2.5</taglibs.standard.version> - <lombok.version>1.18.42</lombok.version> - <jakarta.annotations.version>1.3.5</jakarta.annotations.version> + <lombok.version>1.18.44</lombok.version> <maven.compiler.release>${jdk.version}</maven.compiler.release> @@@ -1184,18 -1286,30 +1184,6 @@@ <scope>runtime</scope> <optional>true</optional> </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.2</version> - <scope>provided</scope> - </dependency> -- <dependency> -- <groupId>org.apache.taglibs</groupId> -- <artifactId>taglibs-standard-spec</artifactId> -- <version>${taglibs.standard.version}</version> -- <scope>provided</scope> -- </dependency> -- <dependency> -- <groupId>org.apache.taglibs</groupId> -- <artifactId>taglibs-standard-impl</artifactId> -- <version>${taglibs.standard.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>4.0.1</version> -- <scope>provided</scope> -- </dependency> <dependency> <groupId>org.apache.groovy</groupId> <artifactId>groovy</artifactId>
