From 0cc8f1839ffa4bfafc050e101fe85b47bdc033b5 Mon Sep 17 00:00:00 2001
From: Adam Antal <adam.antal@cloudera.com>
Date: Thu, 18 Apr 2019 17:36:55 +0200
Subject: [PATCH] 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 ce1a96f2f641f1ba92f8a2b0ccd91381075daa57)
---
 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 8dbcdaecceb..e838df29e6b 100644
--- a/hbase-shaded/hbase-shaded-client/pom.xml
+++ b/hbase-shaded/hbase-shaded-client/pom.xml
@@ -56,6 +56,8 @@
                                 <excludes>
                                     <!-- exclude J2EE modules that come in for JDK11+ -->
                                     <exclude>javax.annotation:javax.annotation-api</exclude>
+                                    <!-- 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 66e0a449934..f704860c1aa 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -134,6 +134,8 @@
                                     <excludes>
                                         <!-- exclude J2EE modules that come in for JDK11+ -->
                                         <exclude>javax.annotation:javax.annotation-api</exclude>
+                                        <!-- 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>