diff --git a/LICENSE-binary b/LICENSE-binary index a79282dec35c7..7348b772845e1 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -218,12 +218,12 @@ com.aliyun:aliyun-java-sdk-sts:3.0.0 com.aliyun.oss:aliyun-sdk-oss:3.13.2 com.cedarsoftware:java-util:1.9.0 com.cedarsoftware:json-io:2.5.1 -com.fasterxml.jackson.core:jackson-annotations:2.14.3 -com.fasterxml.jackson.core:jackson-core:2.14.3 -com.fasterxml.jackson.core:jackson-databind:2.14.3 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.14.3 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.14.3 -com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.14.3 +com.fasterxml.jackson.core:jackson-annotations:2.18.4 +com.fasterxml.jackson.core:jackson-core:2.18.4 +com.fasterxml.jackson.core:jackson-databind:2.18.4 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.18.4 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.18.4 +com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.18.4 com.fasterxml.uuid:java-uuid-generator:3.1.4 com.fasterxml.woodstox:woodstox-core:5.4.0 com.github.ben-manes.caffeine:caffeine:2.9.3 diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 25e7c2343336e..1eaf8096ca56a 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -68,9 +68,12 @@ 2.46 + + 2.3.1 + - 2.14.3 - 2.14.3 + 2.18.4 + 2.18.4 4.5.13 @@ -1292,19 +1295,30 @@ com.fasterxml.jackson.module jackson-module-jaxb-annotations ${jackson2.version} + + + javax.xml.bind + jaxb-api + + com.fasterxml.jackson.dataformat jackson-dataformat-cbor ${jackson2.version} + + javax.xml.bind + jaxb-api + ${jaxb.version} + net.bytebuddy byte-buddy ${byte-buddy.version} - net.bytebuddy + net.bytebuddy byte-buddy-agent ${byte-buddy.version} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml index 7c781bc6bd41a..a5e16ab058856 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml @@ -204,6 +204,10 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider + + javax.xml.bind + jaxb-api + net.jodah failsafe diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/YarnJacksonJaxbJsonProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/YarnJacksonJaxbJsonProvider.java index ee77e13e31cc3..fa96549448ed2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/YarnJacksonJaxbJsonProvider.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/YarnJacksonJaxbJsonProvider.java @@ -25,11 +25,13 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.AnnotationIntrospector; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.type.TypeFactory; import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; +import org.apache.hadoop.yarn.api.records.timeline.TimelineAbout; /** @@ -51,6 +53,9 @@ public YarnJacksonJaxbJsonProvider() { public ObjectMapper locateMapper(Class type, MediaType mediaType) { ObjectMapper mapper = super.locateMapper(type, mediaType); configObjectMapper(mapper); + if (type == TimelineAbout.class) { + mapper.enable(SerializationFeature.WRAP_ROOT_VALUE); + } return mapper; }