diff --git a/hbase-assembly/src/main/assembly/client.xml b/hbase-assembly/src/main/assembly/client.xml
index 54ed2e96fdd8..e9e23d2b2f67 100644
--- a/hbase-assembly/src/main/assembly/client.xml
+++ b/hbase-assembly/src/main/assembly/client.xml
@@ -66,6 +66,11 @@
io.opentelemetry.javaagent:*
org.hamcrest:hamcrest-core
org.mockito:mockito-core
+
+ org.apache.tomcat:tomcat-juli
+ org.apache.tomcat:tomcat-api
+ org.apache.tomcat:tomcat-util-scan
+ org.apache.tomcat:tomcat-util
diff --git a/hbase-assembly/src/main/assembly/hadoop-three-compat.xml b/hbase-assembly/src/main/assembly/hadoop-three-compat.xml
index 771704d6e1df..b25fc31c5e61 100644
--- a/hbase-assembly/src/main/assembly/hadoop-three-compat.xml
+++ b/hbase-assembly/src/main/assembly/hadoop-three-compat.xml
@@ -113,6 +113,11 @@
junit:junit
org.hamcrest:hamcrest-core
org.mockito:mockito-core
+
+ org.apache.tomcat:tomcat-juli
+ org.apache.tomcat:tomcat-api
+ org.apache.tomcat:tomcat-util-scan
+ org.apache.tomcat:tomcat-util
diff --git a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
index 1a733c600ba6..f79279d0a46a 100644
--- a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
+++ b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
@@ -113,6 +113,11 @@
org.slf4j:*
org.apache.logging.log4j:*
io.opentelemetry.javaagent:*
+
+ org.apache.tomcat:tomcat-juli
+ org.apache.tomcat:tomcat-api
+ org.apache.tomcat:tomcat-util-scan
+ org.apache.tomcat:tomcat-util
diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
index 54785976e6ff..624b0ea8e38b 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -348,19 +348,6 @@ under the License.
-
-
- org.glassfish
- javax.el
-
-
- CDDL 1.1
- https://glassfish.java.net/public/CDDL+GPL_1_1.html
- repo
-
-
-
-
org.glassfish.hk2
@@ -530,32 +517,6 @@ under the License.
-
-
- org.glassfish.web
- javax.servlet.jsp
-
-
- CDDL 1.1
- https://glassfish.java.net/public/CDDL+GPL_1_1.html
- repo
-
-
-
-
-
-
- org.glassfish.web
- javax.servlet.jsp.jstl
-
-
- CDDL 1.1
- https://glassfish.java.net/public/CDDL+GPL_1_1.html
- repo
-
-
-
-
javax.validation
diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
index bc8bb065071c..4b6067f4af8e 100644
--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@@ -191,15 +191,8 @@
- org.glassfish.web
- javax.servlet.jsp
-
-
-
- org.glassfish
- javax.el
+ org.apache.tomcat
+ tomcat-jasper
org.apache.kerby
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 132e1faa6ca6..b81c1492af9e 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -181,8 +181,8 @@
- org.glassfish.web
- javax.servlet.jsp
+ org.apache.tomcat
+ tomcat-jasper
diff --git a/hbase-shaded/hbase-shaded-mapreduce/pom.xml b/hbase-shaded/hbase-shaded-mapreduce/pom.xml
index 1b590f0d0421..a5dd3c75540e 100644
--- a/hbase-shaded/hbase-shaded-mapreduce/pom.xml
+++ b/hbase-shaded/hbase-shaded-mapreduce/pom.xml
@@ -101,8 +101,8 @@
jetty-util-ajax
- org.glassfish
- javax.el
+ org.apache.tomcat
+ tomcat-jasper
org.eclipse.jetty
diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
index 64d8fc933ab7..0cd15bd48529 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -114,15 +114,8 @@
- org.glassfish.web
- javax.servlet.jsp
-
-
-
- org.glassfish
- javax.el
+ org.apache.tomcat
+ tomcat-jasper
org.apache.kerby
diff --git a/pom.xml b/pom.xml
index 9190f7a4d0ca..46de456a4cec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -595,8 +595,7 @@
2.3.1
3.1.0
2.1.1
- 2.3.2
- 3.0.1-b08
+ 9.0.93
9.4.8.0
4.13.2
1.3
@@ -1317,9 +1316,23 @@
- org.glassfish.web
- javax.servlet.jsp
- ${glassfish.jsp.version}
+ org.apache.tomcat
+ tomcat-jasper
+ ${tomcat.jasper.version}
+
+
+ org.eclipse.jdt
+ ecj
+
+
+ org.apache.tomcat
+ tomcat-servlet-api
+
+
+ org.apache.tomcat
+ tomcat-jsp-api
+
+
@@ -1327,11 +1340,6 @@
javax.servlet.jsp-api
2.3.1
-
- org.glassfish
- javax.el
- ${glassfish.el.version}
-
javax.xml.bind
jaxb-api