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 9c73df1f2f45..dd76d723f822 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 acfb69a7ebdf..d7d40a965b6d 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 99eb0fb77bec..31da02dca987 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 24bea0f07f54..704a0177e10e 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 279b3fe3e5bc..1b33aa112f07 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 c83988e530a1..d9691d664f00 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 1682a6cd066d..4cab3d804aef 100644 --- a/pom.xml +++ b/pom.xml @@ -589,8 +589,7 @@ 2.3.1 3.1.0 2.1.1 - 2.3.2 - 3.0.1-b08 + 9.0.93 9.2.13.0 4.13.2 1.3 @@ -1304,9 +1303,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 + + @@ -1314,11 +1327,6 @@ javax.servlet.jsp-api 2.3.1 - - org.glassfish - javax.el - ${glassfish.el.version} - javax.xml.bind jaxb-api