From 52b21de1d8857151461341fbcf2fdb38c64485b1 Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Fri, 22 May 2020 11:19:11 +0900
Subject: [PATCH] HADOOP-17049. javax.activation-api and jakarta.activation-api
 define overlapping classes (#2027)

* Removed javax.activation-api from dependency
---
 LICENSE-binary                                              | 2 +-
 hadoop-common-project/hadoop-common/pom.xml                 | 4 ++--
 .../org.apache.hadoop.application-classloader.properties    | 2 +-
 hadoop-project/pom.xml                                      | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index 921d486b23b..dc399df6da7 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -385,7 +385,7 @@ com.google.protobuf:protobuf-java:3.6.1
 com.google.re2j:re2j:1.1
 com.jcraft:jsch:0.1.54
 com.thoughtworks.paranamer:paranamer:2.3
-javax.activation:javax.activation-api:1.2.0
+jakarta.activation:jakarta.activation-api:1.2.1
 org.fusesource.leveldbjni:leveldbjni-all:1.8
 org.jline:jline:3.9.0
 org.hamcrest:hamcrest-core:1.3
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index d7689078502..dd058812fc7 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -94,8 +94,8 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>javax.activation</groupId>
-      <artifactId>javax.activation-api</artifactId>
+      <groupId>jakarta.activation</groupId>
+      <artifactId>jakarta.activation-api</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>
diff --git a/hadoop-common-project/hadoop-common/src/main/resources/org.apache.hadoop.application-classloader.properties b/hadoop-common-project/hadoop-common/src/main/resources/org.apache.hadoop.application-classloader.properties
index cbbb88764d1..dc37949851c 100644
--- a/hadoop-common-project/hadoop-common/src/main/resources/org.apache.hadoop.application-classloader.properties
+++ b/hadoop-common-project/hadoop-common/src/main/resources/org.apache.hadoop.application-classloader.properties
@@ -19,7 +19,7 @@
 # contains key properties for setting up the application classloader
 system.classes.default=java.,\
   javax.accessibility.,\
-  javax.activation.,\
+  -javax.activation.,\
   javax.activity.,\
   javax.annotation.,\
   javax.annotation.processing.,\
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index c38d2b7f137..f3a3d76a642 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -1696,9 +1696,9 @@
         <version>1.0.13</version>
       </dependency>
       <dependency>
-        <groupId>javax.activation</groupId>
-        <artifactId>javax.activation-api</artifactId>
-        <version>1.2.0</version>
+        <groupId>jakarta.activation</groupId>
+        <artifactId>jakarta.activation-api</artifactId>
+        <version>1.2.1</version>
       </dependency>
       <dependency>
         <groupId>javax.annotation</groupId>