This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new f0e7d7490ee HADOOP-19544. Upgrade to Jackson 2.18.5 (#8070)
f0e7d7490ee is described below
commit f0e7d7490ee20007deb9f88e03cb94af02dd0119
Author: PJ Fanning <[email protected]>
AuthorDate: Mon Dec 15 15:58:09 2025 +0100
HADOOP-19544. Upgrade to Jackson 2.18.5 (#8070)
Needed a code change in YarnJacksonJaxbJsonProvider.java
Contributed by PJ Fanning
---
LICENSE-binary | 13 ++++++-------
hadoop-project/pom.xml | 10 ++++++++--
.../hadoop/yarn/webapp/YarnJacksonJaxbJsonProvider.java | 5 +++++
3 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index f4640d4fd6b..26afa11ac8c 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -224,12 +224,12 @@ com.aliyun:java-trace-api:0.2.11-beta
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.5
+com.fasterxml.jackson.core:jackson-core:2.18.5
+com.fasterxml.jackson.core:jackson-databind:2.18.5
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.18.5
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.18.5
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.18.5
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
@@ -626,7 +626,6 @@ javax.cache:cache-api:1.1.1
javax.servlet:javax.servlet-api:3.1.0
javax.servlet.jsp:jsp-api:2.1
javax.websocket:javax.websocket-api:1.0
-javax.xml.bind:jaxb-api:2.3.1
Eclipse Distribution License (EDL) 1.0
--------------------------
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 8b65b09e0a1..802e1b48da2 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -71,8 +71,8 @@
<jaxb.version>2.3.9</jaxb.version>
<!-- jackson versions -->
- <jackson2.version>2.14.3</jackson2.version>
- <jackson2.databind.version>2.14.3</jackson2.databind.version>
+ <jackson2.version>2.18.5</jackson2.version>
+ <jackson2.databind.version>2.18.5</jackson2.databind.version>
<!-- httpcomponents versions -->
<httpclient.version>4.5.13</httpclient.version>
@@ -1304,6 +1304,12 @@
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>${jackson2.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
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 ee77e13e31c..fa96549448e 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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
