You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2017/09/24 00:34:22 UTC

[22/47] hbase git commit: Revert "HBASE-18836 Note need for explicit javax.el and exclude from shaded artifacts"

Revert "HBASE-18836 Note need for explicit javax.el and exclude from shaded artifacts"

This reverts commit de32b11fe4536d07ac4ffee7c59152cebe4f150e.

Mistaken push of wrong branch.


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

Branch: refs/heads/HBASE-18467
Commit: 2a8fb7a9ae6ad88f6b134422b3ba481815e4edde
Parents: de32b11
Author: Sean Busbey <bu...@apache.org>
Authored: Mon Sep 18 08:53:42 2017 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Mon Sep 18 08:53:42 2017 -0500

----------------------------------------------------------------------
 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 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/2a8fb7a9/hbase-rest/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
index 0b18809..4553293 100644
--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@@ -308,9 +308,6 @@
       <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>

http://git-wip-us.apache.org/repos/asf/hbase/blob/2a8fb7a9/hbase-server/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index ad080f1..03891a1 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -495,9 +495,6 @@
       <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>

http://git-wip-us.apache.org/repos/asf/hbase/blob/2a8fb7a9/hbase-shaded/hbase-shaded-mapreduce/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shaded/hbase-shaded-mapreduce/pom.xml b/hbase-shaded/hbase-shaded-mapreduce/pom.xml
index 2afa3c2..d42735a 100644
--- a/hbase-shaded/hbase-shaded-mapreduce/pom.xml
+++ b/hbase-shaded/hbase-shaded-mapreduce/pom.xml
@@ -130,10 +130,6 @@
                 <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>
               </exclusion>

http://git-wip-us.apache.org/repos/asf/hbase/blob/2a8fb7a9/hbase-thrift/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
index 0dc0dde..36c992d 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -299,9 +299,6 @@
       <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>