From 5c12e424e679e738a5b6282ff24348a50ed4ca14 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Fri, 15 Sep 2017 17:30:12 -0700
Subject: [PATCH] HBASE-18831 Add explicit dependency on javax.el

Signed-off-by: Michael Stack <stack@apache.org>
---
 hbase-rest/pom.xml   | 4 ++++
 hbase-server/pom.xml | 4 ++++
 hbase-thrift/pom.xml | 4 ++++
 pom.xml              | 6 ++++++
 4 files changed, 18 insertions(+)

diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
index a0ac6f74d2d..4553293bbbb 100644
--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@@ -308,6 +308,10 @@
       <groupId>org.glassfish.web</groupId>
       <artifactId>javax.servlet.jsp</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish</groupId>
+      <artifactId>javax.el</artifactId>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 1d888d31f1b..03891a1e68e 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -495,6 +495,10 @@
       <groupId>org.glassfish.web</groupId>
       <artifactId>javax.servlet.jsp</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish</groupId>
+      <artifactId>javax.el</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.jackson</groupId>
       <artifactId>jackson-core-asl</artifactId>
diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
index dc9cd8ceea3..36c992d4e58 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -299,6 +299,10 @@
       <groupId>org.glassfish.web</groupId>
       <artifactId>javax.servlet.jsp</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish</groupId>
+      <artifactId>javax.el</artifactId>
+    </dependency>
   </dependencies>
 
   <profiles>
diff --git a/pom.xml b/pom.xml
index af98b514acd..a684f3c749a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1408,6 +1408,7 @@
     <wx.rs.api.version>2.0.1</wx.rs.api.version>
     <jersey.version>2.25.1</jersey.version>
     <glassfish.jsp.version>2.3.2</glassfish.jsp.version>
+    <glassfish.el.version>3.0.1-b08</glassfish.el.version>
     <jetty.jspapi.version>6.1.14</jetty.jspapi.version>
     <jruby.version>9.1.10.0</jruby.version>
     <junit.version>4.12</junit.version>
@@ -1987,6 +1988,11 @@
         <artifactId>javax.servlet.jsp</artifactId>
         <version>${glassfish.jsp.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.glassfish</groupId>
+        <artifactId>javax.el</artifactId>
+        <version>${glassfish.el.version}</version>
+      </dependency>
       <dependency>
         <groupId>javax.xml.bind</groupId>
         <artifactId>jaxb-api</artifactId>