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 2019/05/06 03:23:23 UTC
[hbase] 01/05: HBASE-22268 Exclude javax.activation coming from
Hadoop 3.2+ from shaded artifacts
This is an automated email from the ASF dual-hosted git repository.
busbey pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 71690eca52d89bf7c4faf32dac91c3336d127567
Author: Adam Antal <ad...@cloudera.com>
AuthorDate: Thu Apr 18 17:36:55 2019 +0200
HBASE-22268 Exclude javax.activation coming from Hadoop 3.2+ from shaded artifacts
Signed-off-by: Sean Busbey <bu...@apache.org>
(cherry picked from commit ce1a96f2f641f1ba92f8a2b0ccd91381075daa57)
Conflicts:
hbase-shaded/hbase-shaded-client/pom.xml
hbase-shaded/pom.xml
---
hbase-shaded/hbase-shaded-client/pom.xml | 2 ++
hbase-shaded/pom.xml | 2 ++
2 files changed, 4 insertions(+)
diff --git a/hbase-shaded/hbase-shaded-client/pom.xml b/hbase-shaded/hbase-shaded-client/pom.xml
index 8ff7f9a..79db791 100644
--- a/hbase-shaded/hbase-shaded-client/pom.xml
+++ b/hbase-shaded/hbase-shaded-client/pom.xml
@@ -54,6 +54,8 @@
<configuration>
<artifactSet>
<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
by leaving out the exclude.
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index 3fb8f06..c1b39ad 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -132,6 +132,8 @@
<shadeTestJar>false</shadeTestJar>
<artifactSet>
<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
to include it redefine the exclude list -->
<exclude>org.apache.hadoop:*</exclude>