You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by he...@apache.org on 2020/12/04 14:45:30 UTC
[hadoop] branch branch-3.2.2 updated: HADOOP-15775. [JDK9] Add
missing javax.activation-api dependency. Contributed by Akira Ajisaka.
This is an automated email from the ASF dual-hosted git repository.
hexiaoqiao pushed a commit to branch branch-3.2.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2.2 by this push:
new e0b408e HADOOP-15775. [JDK9] Add missing javax.activation-api dependency. Contributed by Akira Ajisaka.
e0b408e is described below
commit e0b408e4aca73c0bf859a2d8a49aff2460e75c25
Author: Takanobu Asanuma <ta...@apache.org>
AuthorDate: Tue Oct 9 13:06:14 2018 +0900
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 01c781c..3779694 100644
--- a/hadoop-client-modules/hadoop-client-runtime/pom.xml
+++ b/hadoop-client-modules/hadoop-client-runtime/pom.xml
@@ -319,6 +319,13 @@
</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>
<excludes>
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index 1a48d8f..fa4a838 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -90,6 +90,11 @@
<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>
<scope>compile</scope>
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 4cab2b5..6bf575f 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -1497,6 +1497,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>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org