Skip to content

Commit 52a122f

Browse files
authored
Upgrade jackson to 2.9.5 (apache-spark-on-k8s#359)
1 parent ae882c4 commit 52a122f

File tree

5 files changed

+36
-29
lines changed

5 files changed

+36
-29
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(

dev/deps/spark-deps-hadoop-palantir

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ core-1.1.2.jar
4949
curator-client-2.7.1.jar
5050
curator-framework-2.7.1.jar
5151
curator-recipes-2.7.1.jar
52-
dropwizard-jackson-0.9.2.jar
53-
dropwizard-lifecycle-0.9.2.jar
54-
dropwizard-metrics-0.9.2.jar
55-
dropwizard-metrics-influxdb-1.1.8.jar
56-
dropwizard-util-0.9.2.jar
57-
dropwizard-validation-0.9.2.jar
52+
dropwizard-jackson-1.0.0.jar
53+
dropwizard-lifecycle-1.0.0.jar
54+
dropwizard-metrics-1.0.0.jar
55+
dropwizard-metrics-influxdb-1.2.2.jar
56+
dropwizard-util-1.0.0.jar
57+
dropwizard-validation-1.0.0.jar
5858
fastutil-7.0.13.jar
5959
flatbuffers-1.2.0-3f79e055.jar
6060
generex-1.0.1.jar
@@ -79,7 +79,7 @@ hadoop-yarn-client-2.8.2-palantir.2.jar
7979
hadoop-yarn-common-2.8.2-palantir.2.jar
8080
hadoop-yarn-server-common-2.8.2-palantir.2.jar
8181
hadoop-yarn-server-web-proxy-2.8.2-palantir.2.jar
82-
hibernate-validator-5.2.2.Final.jar
82+
hibernate-validator-5.2.4.Final.jar
8383
hk2-api-2.5.0-b32.jar
8484
hk2-locator-2.5.0-b32.jar
8585
hk2-utils-2.5.0-b32.jar
@@ -89,21 +89,22 @@ httpclient-4.5.4.jar
8989
httpcore-4.4.8.jar
9090
ion-java-1.0.1.jar
9191
ivy-2.4.0.jar
92-
jackson-annotations-2.6.7.jar
93-
jackson-core-2.6.7.jar
92+
jackson-annotations-2.9.5.jar
93+
jackson-core-2.9.5.jar
9494
jackson-core-asl-1.9.13.jar
95-
jackson-databind-2.6.7.1.jar
96-
jackson-dataformat-cbor-2.6.7.jar
97-
jackson-dataformat-yaml-2.6.7.jar
98-
jackson-datatype-guava-2.6.7.jar
99-
jackson-datatype-jdk7-2.6.7.jar
100-
jackson-datatype-joda-2.6.7.jar
95+
jackson-databind-2.9.5.jar
96+
jackson-dataformat-cbor-2.9.5.jar
97+
jackson-dataformat-yaml-2.9.5.jar
98+
jackson-datatype-guava-2.9.5.jar
99+
jackson-datatype-jdk8-2.9.5.jar
100+
jackson-datatype-joda-2.9.5.jar
101+
jackson-datatype-jsr310-2.9.5.jar
101102
jackson-jaxrs-1.9.13.jar
102103
jackson-mapper-asl-1.9.13.jar
103-
jackson-module-afterburner-2.6.7.jar
104-
jackson-module-jaxb-annotations-2.6.7.jar
105-
jackson-module-paranamer-2.7.9.jar
106-
jackson-module-scala_2.11-2.6.7.1.jar
104+
jackson-module-afterburner-2.9.5.jar
105+
jackson-module-jaxb-annotations-2.9.5.jar
106+
jackson-module-paranamer-2.9.5.jar
107+
jackson-module-scala_2.11-2.9.5.jar
107108
jackson-xc-1.9.13.jar
108109
janino-3.0.8.jar
109110
java-xmlbuilder-1.1.jar
@@ -140,6 +141,7 @@ jsp-api-2.1.jar
140141
jsr305-3.0.1.jar
141142
jtransforms-2.4.0.jar
142143
jul-to-slf4j-1.7.25.jar
144+
kafka-clients-0.11.0.0.jar
143145
kryo-shaded-3.0.3.jar
144146
kubernetes-client-3.0.0.jar
145147
kubernetes-model-2.0.0.jar
@@ -151,7 +153,7 @@ machinist_2.11-0.6.1.jar
151153
macro-compat_2.11-1.1.1.jar
152154
metrics-core-3.2.5.jar
153155
metrics-graphite-3.2.5.jar
154-
metrics-influxdb-1.1.8.jar
156+
metrics-influxdb-1.2.2.jar
155157
metrics-json-3.2.5.jar
156158
metrics-jvm-3.2.5.jar
157159
minlog-1.3.0.jar
@@ -185,7 +187,7 @@ scala-xml_2.11-1.0.5.jar
185187
shapeless_2.11-2.3.2.jar
186188
slf4j-api-1.7.25.jar
187189
slf4j-log4j12-1.7.25.jar
188-
snakeyaml-1.15.jar
190+
snakeyaml-1.18.jar
189191
snappy-java-1.1.7.1.jar
190192
spire-macros_2.11-0.13.0.jar
191193
spire_2.11-0.13.0.jar

pom.xml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@
145145
<ivy.version>2.4.0</ivy.version>
146146
<oro.version>2.0.8</oro.version>
147147
<codahale.metrics.version>3.2.5</codahale.metrics.version>
148-
<dropwizard.version>0.9.2</dropwizard.version>
149-
<spark-influx-sink.version>0.3.12</spark-influx-sink.version>
148+
<dropwizard.version>1.0.0</dropwizard.version>
149+
<spark-influx-sink.version>0.4.0</spark-influx-sink.version>
150150
<avro.version>1.8.1</avro.version>
151151
<avro.mapred.classifier>hadoop2</avro.mapred.classifier>
152152
<jets3t.version>0.9.4</jets3t.version>
@@ -168,8 +168,8 @@
168168
<scala.version>2.11.8</scala.version>
169169
<scala.binary.version>2.11</scala.binary.version>
170170
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
171-
<fasterxml.jackson.version>2.6.7</fasterxml.jackson.version>
172-
<fasterxml.jackson.databind.version>2.6.7.1</fasterxml.jackson.databind.version>
171+
<fasterxml.jackson.version>2.9.5</fasterxml.jackson.version>
172+
<fasterxml.jackson.databind.version>2.9.5</fasterxml.jackson.databind.version>
173173
<snappy.version>1.1.7.1</snappy.version>
174174
<netlib.java.version>1.1.2</netlib.java.version>
175175
<calcite.version>1.2.0-incubating</calcite.version>
@@ -786,6 +786,11 @@
786786
<groupId>com.fasterxml.jackson.core</groupId>
787787
<artifactId>jackson-annotations</artifactId>
788788
</exclusion>
789+
<!-- Old lz4 dependency with different coordinates -->
790+
<exclusion>
791+
<groupId>net.jpountz.lz4</groupId>
792+
<artifactId>lz4</artifactId>
793+
</exclusion>
789794
</exclusions>
790795
</dependency>
791796
<dependency>
@@ -848,7 +853,7 @@
848853
</dependency>
849854
<dependency>
850855
<groupId>com.fasterxml.jackson.datatype</groupId>
851-
<artifactId>jackson-datatype-jdk7</artifactId>
856+
<artifactId>jackson-datatype-jdk8</artifactId>
852857
<version>${fasterxml.jackson.version}</version>
853858
</dependency>
854859
<dependency>

0 commit comments

Comments
 (0)