This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 6b54f25 HADOOP-17049. javax.activation-api and jakarta.activation-api
define overlapping classes (#2027)
6b54f25 is described below
commit 6b54f259e7ed5ff6f204b8d41b9ef9eb6d5ad616
Author: Akira Ajisaka <aajis...@apache.org>
AuthorDate: Fri May 22 11:19:11 2020 +0900
HADOOP-17049. javax.activation-api and jakarta.activation-api define
overlapping classes (#2027)
* Removed javax.activation-api from dependency
(cherry picked from commit 52b21de1d8857151461341fbcf2fdb38c64485b1)
---
LICENSE-binary | 2 +-
hadoop-common-project/hadoop-common/pom.xml | 4 ++--
.../resources/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 921d486..dc399df 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 2094cf5..0a08c01 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 cbbb887..dc37949 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 5260cc8..2805a39 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>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
