Skip to content

Commit 6b0aa06

Browse files
committed
KE-15125 upgrade jackson databind
1 parent 88c7244 commit 6b0aa06

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

core/src/main/scala/org/apache/spark/deploy/rest/SubmitRestProtocolMessage.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import org.apache.spark.util.Utils
3636
* (2) the Spark version of the client / server
3737
* (3) an optional message
3838
*/
39-
@JsonInclude(Include.NON_NULL)
39+
@JsonInclude(Include.NON_ABSENT)
4040
@JsonAutoDetect(getterVisibility = Visibility.ANY, setterVisibility = Visibility.ANY)
4141
@JsonPropertyOrder(alphabetic = true)
4242
private[rest] abstract class SubmitRestProtocolMessage {

core/src/main/scala/org/apache/spark/rdd/RDDOperationScope.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import org.apache.spark.internal.Logging
4141
* There is no particular relationship between an operation scope and a stage or a job.
4242
* A scope may live inside one stage (e.g. map) or span across multiple jobs (e.g. take).
4343
*/
44-
@JsonInclude(Include.NON_NULL)
44+
@JsonInclude(Include.NON_ABSENT)
4545
@JsonPropertyOrder(Array("id", "name", "parent"))
4646
private[spark] class RDDOperationScope(
4747
val name: String,

core/src/main/scala/org/apache/spark/status/api/v1/JacksonMessageWriter.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ private[v1] class JacksonMessageWriter extends MessageBodyWriter[Object]{
4949
}
5050
mapper.registerModule(com.fasterxml.jackson.module.scala.DefaultScalaModule)
5151
mapper.enable(SerializationFeature.INDENT_OUTPUT)
52-
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL)
52+
mapper.setSerializationInclusion(JsonInclude.Include.NON_ABSENT)
5353
mapper.setDateFormat(JacksonMessageWriter.makeISODateFormat)
5454

5555
override def isWriteable(

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@
159159
<scala.version>2.11.8</scala.version>
160160
<scala.binary.version>2.11</scala.binary.version>
161161
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
162-
<fasterxml.jackson.version>2.6.7</fasterxml.jackson.version>
163-
<fasterxml.jackson.databind.version>2.6.7.1</fasterxml.jackson.databind.version>
162+
<fasterxml.jackson.version>2.9.10</fasterxml.jackson.version>
163+
<fasterxml.jackson.databind.version>2.9.10.4</fasterxml.jackson.databind.version>
164164
<snappy.version>1.1.2.6</snappy.version>
165165
<netlib.java.version>1.1.2</netlib.java.version>
166166
<calcite.version>1.2.0-incubating</calcite.version>
@@ -606,7 +606,7 @@
606606
<dependency>
607607
<groupId>com.fasterxml.jackson.module</groupId>
608608
<artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
609-
<version>${fasterxml.jackson.databind.version}</version>
609+
<version>${fasterxml.jackson.version}</version>
610610
<exclusions>
611611
<exclusion>
612612
<groupId>com.google.guava</groupId>

0 commit comments

Comments
 (0)