Skip to content

Commit ef6d6dc

Browse files
committed
chore(deps): move javax.servlet-api / tomcat-jasper out of root dependencyManagement
Both artifacts are javax-era dependencies consumed only by: - easydoc-core (javax.servlet-api, provided) - easydoc-xhtml (javax.servlet-api, provided) - easydoc-jsp (javax.servlet-api + tomcat-jasper, compile) The root pom no longer manages them, so downstream projects that use io.github.easy4j:easydoc as their parent no longer inherit javax-namespace entries in their dependencyManagement. Each consumer module now declares its own version explicitly (still single-sourced from the parent's ${servlet-api.version} / ${tomcat-jasper.version} properties). easydoc-bom was never affected: its dependencyManagement only manages the 10 easydoc-* modules and never re-exported these entries. Verified: 13-module reactor clean verify green, JaCoCo 90% gate met.
1 parent b37eef9 commit ef6d6dc

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

easydoc-core/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<dependency>
1919
<groupId>javax.servlet</groupId>
2020
<artifactId>javax.servlet-api</artifactId>
21+
<version>${servlet-api.version}</version>
2122
<scope>provided</scope>
2223
</dependency>
2324

easydoc-jsp/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@
2121
<dependency>
2222
<groupId>javax.servlet</groupId>
2323
<artifactId>javax.servlet-api</artifactId>
24+
<version>${servlet-api.version}</version>
2425
</dependency>
2526
<!-- Tomcat 9.x Jasper JSP engine (replaces the hand-rolled easydoc-jsp engine).
2627
Tomcat 10+ ships Jakarta-namespace APIs which conflict with the javax.servlet
2728
surface of this module; staying on 9.0.x keeps the namespace compatible. -->
2829
<dependency>
2930
<groupId>org.apache.tomcat</groupId>
3031
<artifactId>tomcat-jasper</artifactId>
32+
<version>${tomcat-jasper.version}</version>
3133
</dependency>
3234
</dependencies>
3335

easydoc-xhtml/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<dependency>
1919
<groupId>javax.servlet</groupId>
2020
<artifactId>javax.servlet-api</artifactId>
21+
<version>${servlet-api.version}</version>
2122
<scope>provided</scope>
2223
</dependency>
2324

pom.xml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -134,17 +134,13 @@
134134
<version>${assertj.version}</version>
135135
</dependency>
136136

137-
<dependency>
138-
<groupId>javax.servlet</groupId>
139-
<artifactId>javax.servlet-api</artifactId>
140-
<version>${servlet-api.version}</version>
141-
</dependency>
137+
<!-- javax.servlet-api / tomcat-jasper 已从全局 dependencyManagement 移除:
138+
这两个 javax 时代构件只被 easydoc-core(provided)、easydoc-xhtml(provided)、
139+
easydoc-jsp(compile)使用,各模块自行声明版本(属性 ${servlet-api.version} /
140+
${tomcat-jasper.version} 仍由此处统一管理)。这样以本 pom 为 parent 的
141+
Spring Boot 3 / Jakarta EE 下游项目不会在它们的 dependencyManagement
142+
里继承到 javax 命名空间的条目 -->
142143

143-
<dependency>
144-
<groupId>org.apache.tomcat</groupId>
145-
<artifactId>tomcat-jasper</artifactId>
146-
<version>${tomcat-jasper.version}</version>
147-
</dependency>
148144

149145
<dependency>
150146
<groupId>org.slf4j</groupId>

0 commit comments

Comments
 (0)