This is an automated email from the ASF dual-hosted git repository.
lprimak pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/shiro.git
The following commit(s) were added to refs/heads/2.x by this push:
new 0c1731591 chore: using separate tomcat 10 version property for
web-jakarta to avoid issues with dependabot (#2793)
0c1731591 is described below
commit 0c1731591f7afda9699d5a2fdd5b3bf17f9e7835
Author: Lenny Primak <[email protected]>
AuthorDate: Wed Jun 17 15:39:20 2026 -0400
chore: using separate tomcat 10 version property for web-jakarta to avoid
issues with dependabot (#2793)
---
samples/web-jakarta/pom.xml | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/samples/web-jakarta/pom.xml b/samples/web-jakarta/pom.xml
index fbad05c85..135e31eaa 100644
--- a/samples/web-jakarta/pom.xml
+++ b/samples/web-jakarta/pom.xml
@@ -33,7 +33,6 @@
<properties>
<meecrowave.version>1.2.15</meecrowave.version>
- <tomcat.version>${tomcat10.version}</tomcat.version>
<jacoco.skip>true</jacoco.skip>
</properties>
@@ -61,27 +60,27 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
- <version>${tomcat.version}</version>
+ <version>${tomcat10.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-el</artifactId>
- <version>${tomcat.version}</version>
+ <version>${tomcat10.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jaspic-api</artifactId>
- <version>${tomcat.version}</version>
+ <version>${tomcat10.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-websocket</artifactId>
- <version>${tomcat.version}</version>
+ <version>${tomcat10.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
- <version>${tomcat.version}</version>
+ <version>${tomcat10.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -141,7 +140,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper</artifactId>
- <version>${tomcat.version}</version>
+ <version>${tomcat10.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -153,7 +152,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper-el</artifactId>
- <version>${tomcat.version}</version>
+ <version>${tomcat10.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
