diff --git a/hbase-assembly/src/main/assembly/client.xml b/hbase-assembly/src/main/assembly/client.xml
index f0ca402fd058..cd627ae9589b 100644
--- a/hbase-assembly/src/main/assembly/client.xml
+++ b/hbase-assembly/src/main/assembly/client.xml
@@ -67,6 +67,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 84a1bfa36816..e3100bb88fcb 100644
--- a/hbase-assembly/src/main/assembly/hadoop-three-compat.xml
+++ b/hbase-assembly/src/main/assembly/hadoop-three-compat.xml
@@ -87,6 +87,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-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
index 075463af20d8..3e09323e66aa 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -95,19 +95,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
@@ -264,32 +251,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
-
-
-
-
org.bouncycastle
diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
index bb357d96abd8..cf629b62991a 100644
--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@@ -190,15 +190,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 c04947529bf3..92b696d2feca 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -178,8 +178,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 2e7aa6ed33ac..03f9939b50ee 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 90e40f96e7a4..b75b288c8789 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -105,15 +105,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 cc83c8d5aeb8..c134703f95a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -857,8 +857,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
@@ -1566,9 +1565,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
+
+
@@ -1576,11 +1589,6 @@
javax.servlet.jsp-api
2.3.1
-
- org.glassfish
- javax.el
- ${glassfish.el.version}
-
javax.xml.bind
jaxb-api