You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2017/09/16 17:37:54 UTC

hbase git commit: HBASE-18831 Add explicit dependency on javax.el

Repository: hbase
Updated Branches:
  refs/heads/master 81d2927e4 -> 5c12e424e


HBASE-18831 Add explicit dependency on javax.el

Signed-off-by: Michael Stack <st...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5c12e424
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5c12e424
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5c12e424

Branch: refs/heads/master
Commit: 5c12e424e679e738a5b6282ff24348a50ed4ca14
Parents: 81d2927
Author: Michael Stack <st...@apache.org>
Authored: Fri Sep 15 17:30:12 2017 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Sat Sep 16 10:37:27 2017 -0700

----------------------------------------------------------------------
 hbase-rest/pom.xml   | 4 ++++
 hbase-server/pom.xml | 4 ++++
 hbase-thrift/pom.xml | 4 ++++
 pom.xml              | 6 ++++++
 4 files changed, 18 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/5c12e424/hbase-rest/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
index a0ac6f7..4553293 100644
--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@@ -309,6 +309,10 @@
       <artifactId>javax.servlet.jsp</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.glassfish</groupId>
+      <artifactId>javax.el</artifactId>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/hbase/blob/5c12e424/hbase-server/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 1d888d3..03891a1 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -496,6 +496,10 @@
       <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>
     </dependency>

http://git-wip-us.apache.org/repos/asf/hbase/blob/5c12e424/hbase-thrift/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
index dc9cd8c..36c992d 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>

http://git-wip-us.apache.org/repos/asf/hbase/blob/5c12e424/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index af98b51..a684f3c 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>
@@ -1988,6 +1989,11 @@
         <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>
         <version>${jaxb-api.version}</version>