From 6b8cbb26cfc0483045c790b07ac42b5a95ceeaf4 Mon Sep 17 00:00:00 2001
From: Sean Busbey <busbey@apache.org>
Date: Sat, 9 Sep 2017 00:11:56 -0500
Subject: [PATCH] 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>
---
 hbase-shaded/hbase-shaded-mapreduce/pom.xml | 16 ++++++++++++++++
 hbase-shaded/pom.xml                        |  4 ++++
 2 files changed, 20 insertions(+)

diff --git a/hbase-shaded/hbase-shaded-mapreduce/pom.xml b/hbase-shaded/hbase-shaded-mapreduce/pom.xml
index 69f6e5d4cf8..b5f67d7baca 100644
--- a/hbase-shaded/hbase-shaded-mapreduce/pom.xml
+++ b/hbase-shaded/hbase-shaded-mapreduce/pom.xml
@@ -97,6 +97,18 @@
                 <artifactId>jersey-guice</artifactId>
               </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>
@@ -121,6 +133,10 @@
                 <groupId>org.eclipse.jetty</groupId>
                 <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>
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index b3372428692..a4dad11eeed 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -317,6 +317,10 @@
                                         <pattern>org.apache.commons.net</pattern>
                                         <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>