This is an automated email from the ASF dual-hosted git repository.
ritesh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new b55437f06b HDDS-9829. Bump `jaxb-api` to 2.3.3, `jaxb-runtime` to
2.3.9 (#5777)
b55437f06b is described below
commit b55437f06b4ad524ebf4af42b31a92541160bede
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Wed Dec 20 00:07:32 2023 +0100
HDDS-9829. Bump `jaxb-api` to 2.3.3, `jaxb-runtime` to 2.3.9 (#5777)
---
hadoop-hdds/container-service/pom.xml | 4 ++--
hadoop-ozone/datanode/pom.xml | 8 ++++----
hadoop-ozone/dist/src/main/license/bin/LICENSE.txt | 7 +------
hadoop-ozone/dist/src/main/license/jar-report.txt | 8 ++------
hadoop-ozone/httpfsgateway/pom.xml | 4 ++--
hadoop-ozone/insight/pom.xml | 8 ++++----
hadoop-ozone/recon/pom.xml | 10 +++++++--
hadoop-ozone/s3gateway/pom.xml | 8 ++++----
hadoop-ozone/tools/pom.xml | 8 ++++----
pom.xml | 24 +++++++++++-----------
10 files changed, 43 insertions(+), 46 deletions(-)
diff --git a/hadoop-hdds/container-service/pom.xml
b/hadoop-hdds/container-service/pom.xml
index 0c271508e3..079847f7c4 100644
--- a/hadoop-hdds/container-service/pom.xml
+++ b/hadoop-hdds/container-service/pom.xml
@@ -109,8 +109,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
diff --git a/hadoop-ozone/datanode/pom.xml b/hadoop-ozone/datanode/pom.xml
index 8c5843d382..2f21933488 100644
--- a/hadoop-ozone/datanode/pom.xml
+++ b/hadoop-ozone/datanode/pom.xml
@@ -48,16 +48,16 @@
<artifactId>hdds-container-service</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
</dependency>
</dependencies>
<build>
diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
index a361067ae7..465f663bc5 100644
--- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
+++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
@@ -210,6 +210,7 @@ See licenses/ for text of these licenses.
EDL 1.0
=====================
+ com.sun.activation:jakarta.activation
jakarta.activation:jakarta.activation-api
jakarta.xml.bind:jakarta.xml.bind-api
@@ -232,14 +233,12 @@ CDDL 1.1 + GPLv2 with classpath exception
com.sun.jersey:jersey-json
com.sun.jersey:jersey-server
com.sun.jersey:jersey-servlet
- javax.activation:activation
javax.annotation:javax.annotation-api
javax.el:javax.el-api
javax.interceptor:javax.interceptor-api
javax.servlet:javax.servlet-api
javax.servlet.jsp:jsp-api
javax.ws.rs:jsr311-api
- javax.xml.bind:jaxb-api
org.glassfish.hk2.external:aopalliance-repackaged
org.glassfish.hk2.external:jakarta.inject
org.glassfish.hk2.external:javax.inject
@@ -249,8 +248,6 @@ CDDL 1.1 + GPLv2 with classpath exception
org.glassfish.hk2:hk2-utils
org.glassfish.hk2:osgi-resource-locator
org.glassfish.jaxb:jaxb-runtime
- org.glassfish.jaxb:jaxb-core
- org.glassfish.jaxb:jaxb-runtime
org.glassfish.jaxb:txw2
org.glassfish.jersey.containers:jersey-container-servlet
org.glassfish.jersey.containers:jersey-container-servlet-core
@@ -262,7 +259,6 @@ CDDL 1.1 + GPLv2 with classpath exception
org.glassfish.jersey.inject:jersey-hk2
org.glassfish.jersey.media:jersey-media-jaxb
org.glassfish.jersey.media:jersey-media-json-jackson
- org.jvnet.staxex:stax-ex
Apache License 2.0
@@ -301,7 +297,6 @@ Apache License 2.0
com.nimbusds:nimbus-jose-jwt
com.squareup.okhttp3:okhttp
com.squareup.okio:okio
- com.sun.xml.fastinfoset:FastInfoset
commons-beanutils:commons-beanutils
commons-cli:commons-cli
commons-codec:commons-codec
diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt
b/hadoop-ozone/dist/src/main/license/jar-report.txt
index e9a781862d..8792390b2c 100644
--- a/hadoop-ozone/dist/src/main/license/jar-report.txt
+++ b/hadoop-ozone/dist/src/main/license/jar-report.txt
@@ -1,4 +1,3 @@
-share/ozone/lib/activation.jar
share/ozone/lib/animal-sniffer-annotations.jar
share/ozone/lib/annotations.jar
share/ozone/lib/annotations.jar
@@ -40,7 +39,6 @@ share/ozone/lib/disruptor.jar
share/ozone/lib/dnsjava.jar
share/ozone/lib/error_prone_annotations.jar
share/ozone/lib/failureaccess.jar
-share/ozone/lib/FastInfoset.jar
share/ozone/lib/gethostname4j.jar
share/ozone/lib/grpc-api.jar
share/ozone/lib/grpc-context.jar
@@ -107,6 +105,7 @@ share/ozone/lib/jaeger-client.jar
share/ozone/lib/jaeger-core.jar
share/ozone/lib/jaeger-thrift.jar
share/ozone/lib/jaeger-tracerresolver.jar
+share/ozone/lib/jakarta.activation.jar
share/ozone/lib/jakarta.activation-api.jar
share/ozone/lib/jakarta.annotation-api.jar
share/ozone/lib/jakarta.inject.jar
@@ -119,8 +118,6 @@ share/ozone/lib/javax.el-api.jar
share/ozone/lib/javax.inject.jar
share/ozone/lib/javax.interceptor-api.jar
share/ozone/lib/javax.servlet-api.jar
-share/ozone/lib/jaxb-api.jar
-share/ozone/lib/jaxb-core.jar
share/ozone/lib/jaxb-runtime.jar
share/ozone/lib/jcip-annotations.jar
share/ozone/lib/jersey-cdi1x.jar
@@ -266,11 +263,10 @@ share/ozone/lib/spring-jdbc.jar
share/ozone/lib/spring-tx.jar
share/ozone/lib/sqlite-jdbc.jar
share/ozone/lib/stax2-api.jar
-share/ozone/lib/stax-ex.jar
share/ozone/lib/txw2.jar
share/ozone/lib/vault-java-driver.jar
share/ozone/lib/weld-servlet-shaded.Final.jar
share/ozone/lib/woodstox-core.jar
share/ozone/lib/zookeeper.jar
share/ozone/lib/zookeeper-jute.jar
-share/ozone/lib/zstd-jni.jar
\ No newline at end of file
+share/ozone/lib/zstd-jni.jar
diff --git a/hadoop-ozone/httpfsgateway/pom.xml
b/hadoop-ozone/httpfsgateway/pom.xml
index 1ce25c2bea..f56b4006d8 100644
--- a/hadoop-ozone/httpfsgateway/pom.xml
+++ b/hadoop-ozone/httpfsgateway/pom.xml
@@ -150,8 +150,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
diff --git a/hadoop-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml
index c8106b1082..4be02577e0 100644
--- a/hadoop-ozone/insight/pom.xml
+++ b/hadoop-ozone/insight/pom.xml
@@ -66,16 +66,16 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>hdds-tools</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml
index 11f3dee917..4985bb9937 100644
--- a/hadoop-ozone/recon/pom.xml
+++ b/hadoop-ozone/recon/pom.xml
@@ -338,6 +338,12 @@
<groupId>org.jooq</groupId>
<artifactId>jooq</artifactId>
<version>${jooq.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jooq</groupId>
@@ -373,8 +379,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml
index e22f0dc9ac..a8e72a362f 100644
--- a/hadoop-ozone/s3gateway/pom.xml
+++ b/hadoop-ozone/s3gateway/pom.xml
@@ -87,16 +87,16 @@
<artifactId>cdi-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml
index b09b92d0e2..c413d69118 100644
--- a/hadoop-ozone/tools/pom.xml
+++ b/hadoop-ozone/tools/pom.xml
@@ -74,16 +74,16 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
diff --git a/pom.xml b/pom.xml
index 95a0be7187..638da75d43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,9 +148,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<dropwizard-metrics.version>3.2.4</dropwizard-metrics.version>
<jacoco.version>0.8.5</jacoco.version>
<javassist.version>3.21.0-GA</javassist.version>
- <javax-activation.version>1.1.1</javax-activation.version>
- <jaxb-api.version>2.3.0</jaxb-api.version>
- <jaxb-runtime.version>2.3.0.1</jaxb-runtime.version>
+ <activation-api.version>1.2.2</activation-api.version>
+ <jaxb-api.version>2.3.3</jaxb-api.version>
+ <jaxb-runtime.version>2.3.9</jaxb-runtime.version>
<jsch.version>0.1.54</jsch.version>
<cdi-api.version>2.0</cdi-api.version>
<servlet-api.version>3.1.0</servlet-api.version>
@@ -202,7 +202,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<findbugs.version>3.0.0</findbugs.version>
<spotbugs.version>3.1.12</spotbugs.version>
<dnsjava.version>2.1.7</dnsjava.version>
- <jakarta.activation.version>1.2.2</jakarta.activation.version>
<okhttp3.version>4.12.0</okhttp3.version>
<stax2.version>4.2.2</stax2.version>
<jakarta.inject.version>2.6.1</jakarta.inject.version>
@@ -806,11 +805,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<artifactId>zstd-jni</artifactId>
<version>${zstd-jni.version}</version>
</dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>${javax-activation.version}</version>
- </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
@@ -1393,14 +1387,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<version>${findbugs.version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
<version>${jaxb-api.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${jaxb-runtime.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
@@ -1478,7 +1478,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
- <version>${jakarta.activation.version}</version>
+ <version>${activation-api.version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
