Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Sean Busbey 2017-09-09 00:11:56 -05:00
parent 79d9f7a734
commit ade85d8e60
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hbase-shaded/hbase-shaded-mapreduce/pom.xml
View File

@ -97,6 +97,18 @@
<artifactId>jersey-guice</artifactId> <artifactId>jersey-guice</artifactId>
</exclusion> </exclusion>
<!-- Jetty not used by our MR support --> <!-- 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> <exclusion>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId> <artifactId>jetty-server</artifactId>
@ -121,6 +133,10 @@
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId> <artifactId>jetty-webapp</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.glassfish.web</groupId>
<artifactId>javax.servlet.jsp</artifactId>
</exclusion>
<exclusion> <exclusion>
<groupId>org.glassfish.jersey.containers</groupId> <groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId> <artifactId>jersey-container-servlet-core</artifactId>

4
hbase-shaded/pom.xml
View File

@ -317,6 +317,10 @@
<pattern>org.apache.commons.net</pattern> <pattern>org.apache.commons.net</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.net</shadedPattern> <shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.net</shadedPattern>
</relocation> </relocation>
<relocation>
<pattern>org.apache.commons.lang</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.lang</shadedPattern>
</relocation>
<relocation> <relocation>
<pattern>org.apache.commons.lang3</pattern> <pattern>org.apache.commons.lang3</pattern>
<shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.lang3</shadedPattern> <shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.lang3</shadedPattern>