diff --git a/LICENSE-binary b/LICENSE-binary index 921d486b23..dc399df6da 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 2094cf5d5c..0a08c01e30 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -94,8 +94,8 @@ compile - javax.activation - javax.activation-api + jakarta.activation + jakarta.activation-api runtime 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 cbbb88764d..dc37949851 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 5260cc85eb..2805a390ef 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -1696,9 +1696,9 @@ 1.0.13 - javax.activation - javax.activation-api - 1.2.0 + jakarta.activation + jakarta.activation-api + 1.2.1 javax.annotation