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

HBASE-22268 Exclude javax.activation coming from Hadoop 3.2+ from shaded artifacts 

Signed-off-by: Sean Busbey <busbey@apache.org>
(cherry picked from commit ce1a96f2f6)

 Conflicts:
	hbase-shaded/hbase-shaded-client/pom.xml
	hbase-shaded/pom.xml
This commit is contained in:
Adam Antal 2019-04-18 17:36:55 +02:00 committed by Sean Busbey
parent 443da328f2
commit c844660fef
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-shaded/hbase-shaded-client/pom.xml
View File

@ -54,6 +54,8 @@
<configuration> <configuration>
<artifactSet> <artifactSet>
<excludes> <excludes>
<!-- exclude J2EE modules that come in for JDK11+ (since hadoop-3.2.0) -->
<exclude>javax.activation:javax.activation-api</exclude>
<!-- <!--
Tell the shade plugin that in this case we want to include hadoop Tell the shade plugin that in this case we want to include hadoop
by leaving out the exclude. by leaving out the exclude.

2
hbase-shaded/pom.xml
View File

@ -132,6 +132,8 @@
<shadeTestJar>false</shadeTestJar> <shadeTestJar>false</shadeTestJar>
<artifactSet> <artifactSet>
<excludes> <excludes>
<!-- exclude J2EE modules that come in for JDK11+ (since hadoop-3.2.0) -->
<exclude>javax.activation:javax.activation-api</exclude>
<!-- default to excluding Hadoop, have module that want <!-- default to excluding Hadoop, have module that want
to include it redefine the exclude list --> to include it redefine the exclude list -->
<exclude>org.apache.hadoop:*</exclude> <exclude>org.apache.hadoop:*</exclude>