Skip to content

Commit 42a9a9d

Browse files
NihalJainNihalJain
authored
HBASE-28070 Replace javax.servlet.jsp dependency with tomcat-jasper (#5607) (#6236)
Signed-off-by: Istvan Toth <stoty@apache.org> Signed-off-by: Nick Dimiduk <ndimiduk@apache.org> (cherry picked from commit b6394b1)
1 parent dced684 commit 42a9a9d

8 files changed

Lines changed: 36 additions & 71 deletions

File tree

‎hbase-assembly/src/main/assembly/client.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@
6767
<exclude>io.opentelemetry.javaagent:*</exclude>
6868
<exclude>org.hamcrest:hamcrest-core</exclude>
6969
<exclude>org.mockito:mockito-core</exclude>
70+
<!-- Exclude transitive dependencies of tomcat-jasper, not needed at runtime -->
71+
<exclude>org.apache.tomcat:tomcat-juli</exclude>
72+
<exclude>org.apache.tomcat:tomcat-api</exclude>
73+
<exclude>org.apache.tomcat:tomcat-util-scan</exclude>
74+
<exclude>org.apache.tomcat:tomcat-util</exclude>
7075
</excludes>
7176
</dependencySet>
7277
</dependencySets>

‎hbase-assembly/src/main/assembly/hadoop-three-compat.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,11 @@
8787
<exclude>junit:junit</exclude>
8888
<exclude>org.hamcrest:hamcrest-core</exclude>
8989
<exclude>org.mockito:mockito-core</exclude>
90+
<!-- Exclude transitive dependencies of tomcat-jasper, not needed at runtime -->
91+
<exclude>org.apache.tomcat:tomcat-juli</exclude>
92+
<exclude>org.apache.tomcat:tomcat-api</exclude>
93+
<exclude>org.apache.tomcat:tomcat-util-scan</exclude>
94+
<exclude>org.apache.tomcat:tomcat-util</exclude>
9095
</excludes>
9196
</dependencySet>
9297
</dependencySets>

‎hbase-resource-bundle/src/main/resources/supplemental-models.xml‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -95,19 +95,6 @@ under the License.
9595
</licenses>
9696
</project>
9797
</supplement>
98-
<supplement>
99-
<project>
100-
<groupId>org.glassfish</groupId>
101-
<artifactId>javax.el</artifactId>
102-
<licenses>
103-
<license>
104-
<name>CDDL 1.1</name>
105-
<url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url>
106-
<distribution>repo</distribution>
107-
</license>
108-
</licenses>
109-
</project>
110-
</supplement>
11198
<supplement>
11299
<project>
113100
<groupId>org.glassfish.hk2</groupId>
@@ -264,32 +251,6 @@ under the License.
264251
</licenses>
265252
</project>
266253
</supplement>
267-
<supplement>
268-
<project>
269-
<groupId>org.glassfish.web</groupId>
270-
<artifactId>javax.servlet.jsp</artifactId>
271-
<licenses>
272-
<license>
273-
<name>CDDL 1.1</name>
274-
<url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url>
275-
<distribution>repo</distribution>
276-
</license>
277-
</licenses>
278-
</project>
279-
</supplement>
280-
<supplement>
281-
<project>
282-
<groupId>org.glassfish.web</groupId>
283-
<artifactId>javax.servlet.jsp.jstl</artifactId>
284-
<licenses>
285-
<license>
286-
<name>CDDL 1.1</name>
287-
<url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url>
288-
<distribution>repo</distribution>
289-
</license>
290-
</licenses>
291-
</project>
292-
</supplement>
293254
<supplement>
294255
<project>
295256
<groupId>org.bouncycastle</groupId>

‎hbase-rest/pom.xml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -190,15 +190,8 @@
190190
</dependency>
191191
<dependency>
192192
<!--For JspC used in ant task-->
193-
<groupId>org.glassfish.web</groupId>
194-
<artifactId>javax.servlet.jsp</artifactId>
195-
</dependency>
196-
<!-- Specifically needed for jetty-jsp, included
197-
to bypass version scanning that hits a bad repo
198-
see HBASE-18831 -->
199-
<dependency>
200-
<groupId>org.glassfish</groupId>
201-
<artifactId>javax.el</artifactId>
193+
<groupId>org.apache.tomcat</groupId>
194+
<artifactId>tomcat-jasper</artifactId>
202195
</dependency>
203196
<dependency>
204197
<groupId>org.apache.kerby</groupId>

‎hbase-server/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@
178178
<!-- For JspC used in ant task, then needed at compile /runtime
179179
because the source code made from the JSP refers to its runtime
180180
-->
181-
<groupId>org.glassfish.web</groupId>
182-
<artifactId>javax.servlet.jsp</artifactId>
181+
<groupId>org.apache.tomcat</groupId>
182+
<artifactId>tomcat-jasper</artifactId>
183183
</dependency>
184184
<!-- Also used by generated sources from our JSP -->
185185
<dependency>

‎hbase-shaded/hbase-shaded-mapreduce/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@
101101
<artifactId>jetty-util-ajax</artifactId>
102102
</exclusion>
103103
<exclusion>
104-
<groupId>org.glassfish</groupId>
105-
<artifactId>javax.el</artifactId>
104+
<groupId>org.apache.tomcat</groupId>
105+
<artifactId>tomcat-jasper</artifactId>
106106
</exclusion>
107107
<exclusion>
108108
<groupId>org.eclipse.jetty</groupId>

‎hbase-thrift/pom.xml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,8 @@
105105
</dependency>
106106
<dependency>
107107
<!--For JspC used in ant task-->
108-
<groupId>org.glassfish.web</groupId>
109-
<artifactId>javax.servlet.jsp</artifactId>
110-
</dependency>
111-
<!-- Specifically needed for jetty-jsp, included
112-
to bypass version scanning that hits a bad repo
113-
see HBASE-18831 -->
114-
<dependency>
115-
<groupId>org.glassfish</groupId>
116-
<artifactId>javax.el</artifactId>
108+
<groupId>org.apache.tomcat</groupId>
109+
<artifactId>tomcat-jasper</artifactId>
117110
</dependency>
118111
<dependency>
119112
<groupId>org.apache.kerby</groupId>

‎pom.xml‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -839,8 +839,7 @@
839839
<jaxb-api.version>2.3.1</jaxb-api.version>
840840
<servlet.api.version>3.1.0</servlet.api.version>
841841
<wx.rs.api.version>2.1.1</wx.rs.api.version>
842-
<glassfish.jsp.version>2.3.2</glassfish.jsp.version>
843-
<glassfish.el.version>3.0.1-b08</glassfish.el.version>
842+
<tomcat.jasper.version>9.0.93</tomcat.jasper.version>
844843
<jruby.version>9.4.8.0</jruby.version>
845844
<junit.version>4.13.2</junit.version>
846845
<hamcrest.version>1.3</hamcrest.version>
@@ -1548,21 +1547,30 @@
15481547
</dependency>
15491548
<dependency>
15501549
<!--This lib has JspC in it. Needed precompiling jsps in hbase-rest, etc.-->
1551-
<groupId>org.glassfish.web</groupId>
1552-
<artifactId>javax.servlet.jsp</artifactId>
1553-
<version>${glassfish.jsp.version}</version>
1550+
<groupId>org.apache.tomcat</groupId>
1551+
<artifactId>tomcat-jasper</artifactId>
1552+
<version>${tomcat.jasper.version}</version>
1553+
<exclusions>
1554+
<exclusion>
1555+
<groupId>org.eclipse.jdt</groupId>
1556+
<artifactId>ecj</artifactId>
1557+
</exclusion>
1558+
<exclusion>
1559+
<groupId>org.apache.tomcat</groupId>
1560+
<artifactId>tomcat-servlet-api</artifactId>
1561+
</exclusion>
1562+
<exclusion>
1563+
<groupId>org.apache.tomcat</groupId>
1564+
<artifactId>tomcat-jsp-api</artifactId>
1565+
</exclusion>
1566+
</exclusions>
15541567
</dependency>
15551568
<dependency>
15561569
<!-- this lib is used by the compiled Jsp from the above JspC -->
15571570
<groupId>javax.servlet.jsp</groupId>
15581571
<artifactId>javax.servlet.jsp-api</artifactId>
15591572
<version>2.3.1</version>
15601573
</dependency>
1561-
<dependency>
1562-
<groupId>org.glassfish</groupId>
1563-
<artifactId>javax.el</artifactId>
1564-
<version>${glassfish.el.version}</version>
1565-
</dependency>
15661574
<dependency>
15671575
<groupId>javax.xml.bind</groupId>
15681576
<artifactId>jaxb-api</artifactId>

0 commit comments

Comments
 (0)