From af042ab0fc56641d96a8ce0681635787a1d3804f Mon Sep 17 00:00:00 2001
From: Wei-Chiu Chuang <weichiu@cloudera.com>
Date: Tue, 25 May 2021 00:34:42 +0800
Subject: [PATCH] HBASE-25908 Exclude jakarta.activation-api

Change-Id: I9fb87dbbc6a67d512d9e2c42d761175b00249afc
---
 hbase-shaded/hbase-shaded-client/pom.xml | 1 +
 hbase-shaded/pom.xml                     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/hbase-shaded/hbase-shaded-client/pom.xml b/hbase-shaded/hbase-shaded-client/pom.xml
index 87060756d396..1145164c7b79 100644
--- a/hbase-shaded/hbase-shaded-client/pom.xml
+++ b/hbase-shaded/hbase-shaded-client/pom.xml
@@ -59,6 +59,7 @@
                        need not be included -->
                   <exclude>javax.annotation:javax.annotation-api</exclude>
                   <exclude>javax.activation:javax.activation-api</exclude>
+                  <exclude>jakarta.activation:jakarta.activation-api</exclude> <!-- Hadoop 3.3.1 -->
                   <exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
                   <exclude>jakarta.annotation:jakarta.annotation-api</exclude>
                   <exclude>jakarta.validation:jakarta.validation-api</exclude>
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index 5ddd845ac01e..b967245e8bae 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -146,6 +146,7 @@
                          need not be included -->
                     <exclude>javax.annotation:javax.annotation-api</exclude>
                     <exclude>javax.activation:javax.activation-api</exclude>
+                    <exclude>jakarta.activation:jakarta.activation-api</exclude> <!-- Hadoop 3.3.1 -->
                     <exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
                     <exclude>jakarta.annotation:jakarta.annotation-api</exclude>
                     <exclude>jakarta.validation:jakarta.validation-api</exclude>