hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bus...@apache.org
Subject [39/50] [abbrv] hbase git commit: HBASE-18759 Fix hbase-shaded-check-invariants failure
Date Mon, 11 Sep 2017 07:43:06 GMT
HBASE-18759 Fix hbase-shaded-check-invariants failure

* relocate the commons-lang 2.y that comes in from hadoop
* exclude some additional jetty / glassfish / javax.servlet from shaded mapreduce

Signed-off-by: Apekshit Sharma <appy@apache.org>


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

Branch: refs/heads/HBASE-18467
Commit: ade85d8e60fef8d8fad505e65af0de8d80f743f6
Parents: 79d9f7a
Author: Sean Busbey <busbey@apache.org>
Authored: Sat Sep 9 00:11:56 2017 -0500
Committer: Sean Busbey <busbey@apache.org>
Committed: Sun Sep 10 23:11:01 2017 -0500

----------------------------------------------------------------------
 hbase-shaded/hbase-shaded-mapreduce/pom.xml | 16 ++++++++++++++++
 hbase-shaded/pom.xml                        |  4 ++++
 2 files changed, 20 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/ade85d8e/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 f791ddc..d42735a 100644
--- a/hbase-shaded/hbase-shaded-mapreduce/pom.xml
+++ b/hbase-shaded/hbase-shaded-mapreduce/pom.xml
@@ -98,6 +98,18 @@
               </exclusion>
               <!-- Jetty not used by our MR support -->
               <exclusion>
+                <groupId>javax.servlet</groupId>
+                <artifactId>javax.servlet-api</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-http</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-security</artifactId>
+              </exclusion>
+              <exclusion>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-server</artifactId>
               </exclusion>
@@ -122,6 +134,10 @@
                 <artifactId>jetty-webapp</artifactId>
               </exclusion>
               <exclusion>
+                <groupId>org.glassfish.web</groupId>
+                <artifactId>javax.servlet.jsp</artifactId>
+              </exclusion>
+              <exclusion>
                 <groupId>org.glassfish.jersey.containers</groupId>
                 <artifactId>jersey-container-servlet-core</artifactId>
               </exclusion>

http://git-wip-us.apache.org/repos/asf/hbase/blob/ade85d8e/hbase-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index 16361b7..b3b6e33 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -318,6 +318,10 @@
                                         <shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.net</shadedPattern>
                                     </relocation>
                                     <relocation>
+                                        <pattern>org.apache.commons.lang</pattern>
+                                        <shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.lang</shadedPattern>
+                                    </relocation>
+                                    <relocation>
                                         <pattern>org.apache.commons.lang3</pattern>
                                         <shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.lang3</shadedPattern>
                                     </relocation>


Mime
View raw message