From 9bbeb5248640ec5df8420a5e359436375f73e0ce Mon Sep 17 00:00:00 2001
From: Takanobu Asanuma <tasanuma@apache.org>
Date: Tue, 9 Oct 2018 13:06:14 +0900
Subject: [PATCH] HADOOP-15775. [JDK9] Add missing javax.activation-api
 dependency. Contributed by Akira Ajisaka.

---
 hadoop-client-modules/hadoop-client-runtime/pom.xml | 7 +++++++
 hadoop-common-project/hadoop-common/pom.xml         | 5 +++++
 hadoop-project/pom.xml                              | 5 +++++
 3 files changed, 17 insertions(+)

diff --git a/hadoop-client-modules/hadoop-client-runtime/pom.xml b/hadoop-client-modules/hadoop-client-runtime/pom.xml
index 1779db1f31..8afc89e834 100644
--- a/hadoop-client-modules/hadoop-client-runtime/pom.xml
+++ b/hadoop-client-modules/hadoop-client-runtime/pom.xml
@@ -313,6 +313,13 @@
                         <exclude>**/pom.xml</exclude>
                       </excludes>
                     </relocation>
+                    <relocation>
+                      <pattern>javax/activation/</pattern>
+                      <shadedPattern>${shaded.dependency.prefix}.javax.activation.</shadedPattern>
+                      <excludes>
+                        <exclude>**/pom.xml</exclude>
+                      </excludes>
+                    </relocation>
                     <relocation>
                       <pattern>javax/ws/</pattern>
                       <shadedPattern>${shaded.dependency.prefix}.javax.ws.</shadedPattern>
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index 6a7433a2ac..a9e0fb19dc 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -90,6 +90,11 @@
       <artifactId>javax.servlet-api</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>javax.activation-api</artifactId>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 688e54b10a..0f54a55460 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -1586,6 +1586,11 @@
         <artifactId>jcodings</artifactId>
         <version>1.0.13</version>
       </dependency>
+      <dependency>
+        <groupId>javax.activation</groupId>
+        <artifactId>javax.activation-api</artifactId>
+        <version>1.2.0</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>