From b9a4c552e709dbae8c9d8a50ba8b4b3b16a41fe4 Mon Sep 17 00:00:00 2001
From: Sakthi <jatsakthi@cloudera.com>
Date: Fri, 6 Jul 2018 14:00:28 -0700
Subject: [PATCH] HBASE-20617 Removed jetty-jsp module.

Signed-off-by: Mike Drob <mdrob@apache.org>
---
 .../src/main/resources/supplemental-models.xml     | 14 --------------
 hbase-shaded/hbase-shaded-mapreduce/pom.xml        |  4 ----
 hbase-thrift/pom.xml                               |  5 -----
 pom.xml                                            |  6 ------
 4 files changed, 29 deletions(-)

diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
index 9897769451b..d0754b546fc 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -276,20 +276,6 @@ under the License.
       </licenses>
     </project>
   </supplement>
-  <supplement>
-    <project>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-jsp</artifactId>
-
-      <licenses>
-        <license>
-          <name>Apache License, Version 2.0</name>
-          <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          <distribution>repo</distribution>
-        </license>
-      </licenses>
-    </project>
-  </supplement>
   <supplement>
     <project>
       <groupId>org.eclipse.jetty</groupId>
diff --git a/hbase-shaded/hbase-shaded-mapreduce/pom.xml b/hbase-shaded/hbase-shaded-mapreduce/pom.xml
index 7c1e44b2144..cf02e06d209 100644
--- a/hbase-shaded/hbase-shaded-mapreduce/pom.xml
+++ b/hbase-shaded/hbase-shaded-mapreduce/pom.xml
@@ -129,10 +129,6 @@
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-util-ajax</artifactId>
               </exclusion>
-              <exclusion>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-jsp</artifactId>
-              </exclusion>
               <exclusion>
                 <groupId>org.glassfish</groupId>
                 <artifactId>javax.el</artifactId>
diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
index 412b28d70cf..276c3b5a333 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -250,11 +250,6 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
     </dependency>
-    <dependency>
-      <!--Ant task needs this-->
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-jsp</artifactId>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/pom.xml b/pom.xml
index 4db89bd70a4..caa390122b7 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1350,7 +1350,6 @@
     <jackson.version>2.9.2</jackson.version>
     <jaxb-api.version>2.2.12</jaxb-api.version>
     <jetty.version>9.3.19.v20170502</jetty.version>
-    <jetty-jsp.version>9.2.19.v20160908</jetty-jsp.version>
     <servlet.api.version>3.1.0</servlet.api.version>
     <wx.rs.api.version>2.0.1</wx.rs.api.version>
     <!-- Jersey 2.26 requires jetty 9.4 which breaks hadoop. Tread lightly. -->
@@ -1934,11 +1933,6 @@
         <artifactId>jetty-io</artifactId>
         <version>${jetty.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-jsp</artifactId>
-        <version>${jetty-jsp.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-jmx</artifactId>