From 83e9188d0cb0736ef643a39c5edcb9eb2930b31e Mon Sep 17 00:00:00 2001
From: Sean Busbey <busbey@apache.org>
Date: Mon, 18 Sep 2017 08:47:22 -0500
Subject: [PATCH] HBASE-18836 Note need for explicit javax.el and exclude from
 shaded artifacts

Signed-off-by: Huaxiang Sun <huaxiangsun@apache.org>
---
 hbase-rest/pom.xml                          | 3 +++
 hbase-server/pom.xml                        | 3 +++
 hbase-shaded/hbase-shaded-mapreduce/pom.xml | 4 ++++
 hbase-thrift/pom.xml                        | 3 +++
 4 files changed, 13 insertions(+)

diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
index f479e891cc8..0e8cc24772b 100644
--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@@ -308,6 +308,9 @@
       <groupId>org.glassfish.web</groupId>
       <artifactId>javax.servlet.jsp</artifactId>
     </dependency>
+    <!-- Specifically needed for jetty-jsp, included
+         to bypass version scanning that hits a bad repo
+         see HBASE-18831 -->
     <dependency>
       <groupId>org.glassfish</groupId>
       <artifactId>javax.el</artifactId>
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 77b992dca4c..82154aa4626 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -495,6 +495,9 @@
       <groupId>org.glassfish.web</groupId>
       <artifactId>javax.servlet.jsp</artifactId>
     </dependency>
+    <!-- Specifically needed for jetty-jsp, included
+         to bypass version scanning that hits a bad repo
+         see HBASE-18831 -->
     <dependency>
       <groupId>org.glassfish</groupId>
       <artifactId>javax.el</artifactId>
diff --git a/hbase-shaded/hbase-shaded-mapreduce/pom.xml b/hbase-shaded/hbase-shaded-mapreduce/pom.xml
index 2dbc47310ea..5bc1d1b802c 100644
--- a/hbase-shaded/hbase-shaded-mapreduce/pom.xml
+++ b/hbase-shaded/hbase-shaded-mapreduce/pom.xml
@@ -129,6 +129,10 @@
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-jsp</artifactId>
               </exclusion>
+              <exclusion>
+                <groupId>org.glassfish</groupId>
+                <artifactId>javax.el</artifactId>
+              </exclusion>
               <exclusion>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-webapp</artifactId>
diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
index 324255077f2..fd7a0edd882 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -299,6 +299,9 @@
       <groupId>org.glassfish.web</groupId>
       <artifactId>javax.servlet.jsp</artifactId>
     </dependency>
+    <!-- Specifically needed for jetty-jsp, included
+         to bypass version scanning that hits a bad repo
+         see HBASE-18831 -->
     <dependency>
       <groupId>org.glassfish</groupId>
       <artifactId>javax.el</artifactId>