Skip to content

Commit a26aa4b

Browse files
yugan95Yu Gan
yugan95
and
Yu Gan
authored
apache#135 bump jackson version to 2.10.4 (apache#136)
* apache#135 bump jackson version to 2.10.4 * apache#135 update spark version r41 Co-authored-by: Yu Gan <yu.gan@kyligence.io>
1 parent 528f909 commit a26aa4b

File tree

49 files changed

+92
-75
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+92
-75
lines changed

‎assembly/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.11</artifactId>
24-
<version>2.4.1-kylin-r40</version>
24+
<version>2.4.1-kylin-r41</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎common/kvstore/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.11</artifactId>
25-
<version>2.4.1-kylin-r40</version>
25+
<version>2.4.1-kylin-r41</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/network-common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.11</artifactId>
25-
<version>2.4.1-kylin-r40</version>
25+
<version>2.4.1-kylin-r41</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/network-shuffle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.11</artifactId>
25-
<version>2.4.1-kylin-r40</version>
25+
<version>2.4.1-kylin-r41</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/network-yarn/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.11</artifactId>
25-
<version>2.4.1-kylin-r40</version>
25+
<version>2.4.1-kylin-r41</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/sketch/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.11</artifactId>
25-
<version>2.4.1-kylin-r40</version>
25+
<version>2.4.1-kylin-r41</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/tags/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.11</artifactId>
25-
<version>2.4.1-kylin-r40</version>
25+
<version>2.4.1-kylin-r41</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/unsafe/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.11</artifactId>
25-
<version>2.4.1-kylin-r40</version>
25+
<version>2.4.1-kylin-r41</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎core/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.11</artifactId>
24-
<version>2.4.1-kylin-r40</version>
24+
<version>2.4.1-kylin-r41</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

@@ -220,6 +220,10 @@
220220
<groupId>org.scala-lang</groupId>
221221
<artifactId>scala-library</artifactId>
222222
</dependency>
223+
<dependency>
224+
<groupId>org.scala-lang</groupId>
225+
<artifactId>scala-reflect</artifactId>
226+
</dependency>
223227
<dependency>
224228
<groupId>org.json4s</groupId>
225229
<artifactId>json4s-jackson_${scala.binary.version}</artifactId>

‎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/KVUtils.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private[spark] object KVUtils extends Logging {
4242
private[spark] class KVStoreScalaSerializer extends KVStoreSerializer {
4343

4444
mapper.registerModule(DefaultScalaModule)
45-
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL)
45+
mapper.setSerializationInclusion(JsonInclude.Include.NON_ABSENT)
4646

4747
}
4848

‎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-2.6

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,16 @@ htrace-core-3.0.4.jar
8787
httpclient-4.5.6.jar
8888
httpcore-4.4.10.jar
8989
ivy-2.4.0.jar
90-
jackson-annotations-2.6.7.jar
91-
jackson-core-2.6.7.jar
90+
jackson-annotations-2.10.4.jar
91+
jackson-core-2.10.4.jar
9292
jackson-core-asl-1.9.13.jar
93-
jackson-databind-2.6.7.1.jar
94-
jackson-dataformat-yaml-2.6.7.jar
93+
jackson-databind-2.10.4.jar
94+
jackson-dataformat-yaml-2.10.4.jar
9595
jackson-jaxrs-1.9.13.jar
9696
jackson-mapper-asl-1.9.13.jar
97-
jackson-module-jaxb-annotations-2.6.7.jar
98-
jackson-module-paranamer-2.7.9.jar
99-
jackson-module-scala_2.11-2.6.7.1.jar
97+
jackson-module-jaxb-annotations-2.10.4.jar
98+
jackson-module-paranamer-2.10.4.jar
99+
jackson-module-scala_2.11-2.10.4.jar
100100
jackson-xc-1.9.13.jar
101101
janino-3.0.9.jar
102102
javassist-3.18.1-GA.jar

‎dev/deps/spark-deps-hadoop-2.7

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,16 @@ htrace-core-3.1.0-incubating.jar
8787
httpclient-4.5.6.jar
8888
httpcore-4.4.10.jar
8989
ivy-2.4.0.jar
90-
jackson-annotations-2.6.7.jar
91-
jackson-core-2.6.7.jar
90+
jackson-annotations-2.10.4.jar
91+
jackson-core-2.10.4.jar
9292
jackson-core-asl-1.9.13.jar
93-
jackson-databind-2.6.7.1.jar
94-
jackson-dataformat-yaml-2.6.7.jar
93+
jackson-databind-2.10.4.jar
94+
jackson-dataformat-yaml-2.10.4.jar
9595
jackson-jaxrs-1.9.13.jar
9696
jackson-mapper-asl-1.9.13.jar
97-
jackson-module-jaxb-annotations-2.6.7.jar
98-
jackson-module-paranamer-2.7.9.jar
99-
jackson-module-scala_2.11-2.6.7.1.jar
97+
jackson-module-jaxb-annotations-2.10.4.jar
98+
jackson-module-paranamer-2.10.4.jar
99+
jackson-module-scala_2.11-2.10.4.jar
100100
jackson-xc-1.9.13.jar
101101
janino-3.0.9.jar
102102
javassist-3.18.1-GA.jar

‎dev/deps/spark-deps-hadoop-3.1

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,17 +86,17 @@ htrace-core4-4.1.0-incubating.jar
8686
httpclient-4.5.6.jar
8787
httpcore-4.4.10.jar
8888
ivy-2.4.0.jar
89-
jackson-annotations-2.6.7.jar
90-
jackson-core-2.6.7.jar
89+
jackson-annotations-2.10.4.jar
90+
jackson-core-2.10.4.jar
9191
jackson-core-asl-1.9.13.jar
92-
jackson-databind-2.6.7.1.jar
93-
jackson-dataformat-yaml-2.6.7.jar
94-
jackson-jaxrs-base-2.7.8.jar
95-
jackson-jaxrs-json-provider-2.7.8.jar
92+
jackson-databind-2.10.4.jar
93+
jackson-dataformat-yaml-2.10.4.jar
94+
jackson-jaxrs-base-2.10.4.jar
95+
jackson-jaxrs-json-provider-2.10.4.jar
9696
jackson-mapper-asl-1.9.13.jar
97-
jackson-module-jaxb-annotations-2.6.7.jar
98-
jackson-module-paranamer-2.7.9.jar
99-
jackson-module-scala_2.11-2.6.7.1.jar
97+
jackson-module-jaxb-annotations-2.10.4.jar
98+
jackson-module-paranamer-2.10.4.jar
99+
jackson-module-scala_2.11-2.10.4.jar
100100
janino-3.0.9.jar
101101
javassist-3.18.1-GA.jar
102102
javax.annotation-api-1.2.jar

‎examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.11</artifactId>
24-
<version>2.4.1-kylin-r40</version>
24+
<version>2.4.1-kylin-r41</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎external/avro/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.11</artifactId>
24-
<version>2.4.1-kylin-r40</version>
24+
<version>2.4.1-kylin-r41</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/docker-integration-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.11</artifactId>
25-
<version>2.4.1-kylin-r40</version>
25+
<version>2.4.1-kylin-r41</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎external/flume-assembly/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.11</artifactId>
24-
<version>2.4.1-kylin-r40</version>
24+
<version>2.4.1-kylin-r41</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/flume-sink/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.11</artifactId>
24-
<version>2.4.1-kylin-r40</version>
24+
<version>2.4.1-kylin-r41</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/flume/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.11</artifactId>
24-
<version>2.4.1-kylin-r40</version>
24+
<version>2.4.1-kylin-r41</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/kafka-0-10-assembly/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.11</artifactId>
24-
<version>2.4.1-kylin-r40</version>
24+
<version>2.4.1-kylin-r41</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/kafka-0-10-sql/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.11</artifactId>
24-
<version>2.4.1-kylin-r40</version>
24+
<version>2.4.1-kylin-r41</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/kafka-0-10/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.11</artifactId>
24-
<version>2.4.1-kylin-r40</version>
24+
<version>2.4.1-kylin-r41</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/kafka-0-8-assembly/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.11</artifactId>
24-
<version>2.4.1-kylin-r40</version>
24+
<version>2.4.1-kylin-r41</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/kafka-0-8/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.11</artifactId>
24-
<version>2.4.1-kylin-r40</version>
24+
<version>2.4.1-kylin-r41</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/kinesis-asl-assembly/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.11</artifactId>
24-
<version>2.4.1-kylin-r40</version>
24+
<version>2.4.1-kylin-r41</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/kinesis-asl/pom.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.apache.spark</groupId>
2222
<artifactId>spark-parent_2.11</artifactId>
23-
<version>2.4.1-kylin-r40</version>
23+
<version>2.4.1-kylin-r41</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

@@ -69,6 +69,13 @@
6969
<version>${aws.kinesis.producer.version}</version>
7070
<scope>test</scope>
7171
</dependency>
72+
<!-- manage this up explicitly to match Spark; com.amazonaws:aws-java-sdk-pom specifies
73+
2.6.7 but says we can manage it up -->
74+
<dependency>
75+
<groupId>com.fasterxml.jackson.dataformat</groupId>
76+
<artifactId>jackson-dataformat-cbor</artifactId>
77+
<version>${fasterxml.jackson.version}</version>
78+
</dependency>
7279
<dependency>
7380
<groupId>org.mockito</groupId>
7481
<artifactId>mockito-core</artifactId>

‎external/spark-ganglia-lgpl/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.apache.spark</groupId>
2222
<artifactId>spark-parent_2.11</artifactId>
23-
<version>2.4.1-kylin-r40</version>
23+
<version>2.4.1-kylin-r41</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

‎graphx/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.11</artifactId>
24-
<version>2.4.1-kylin-r40</version>
24+
<version>2.4.1-kylin-r41</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎hadoop-cloud/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.11</artifactId>
25-
<version>2.4.1-kylin-r40</version>
25+
<version>2.4.1-kylin-r41</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

‎launcher/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.11</artifactId>
25-
<version>2.4.1-kylin-r40</version>
25+
<version>2.4.1-kylin-r41</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

‎mllib-local/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.11</artifactId>
24-
<version>2.4.1-kylin-r40</version>
24+
<version>2.4.1-kylin-r41</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎mllib/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.11</artifactId>
24-
<version>2.4.1-kylin-r40</version>
24+
<version>2.4.1-kylin-r41</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

0 commit comments

Comments
 (0)