diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml index fa0293207f8a4..26b655b74ba2a 100644 --- a/common/network-yarn/pom.xml +++ b/common/network-yarn/pom.xml @@ -22,7 +22,11 @@ org.apache.spark spark-parent_2.11 +<<<<<<< HEAD 2.4.1-kylin-r39 +======= + 2.4.1-kylin-r40 +>>>>>>> parent of a26aa4b7a5... #135 bump jackson version to 2.10.4 (#136) ../../pom.xml diff --git a/core/pom.xml b/core/pom.xml index 508d393ebc4e8..20c94fb5f09b5 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -220,10 +220,6 @@ org.scala-lang scala-library - - org.scala-lang - scala-reflect - org.json4s json4s-jackson_${scala.binary.version} diff --git a/core/src/main/scala/org/apache/spark/deploy/rest/SubmitRestProtocolMessage.scala b/core/src/main/scala/org/apache/spark/deploy/rest/SubmitRestProtocolMessage.scala index 97b689cdadd5f..ef5a7e35ad562 100644 --- a/core/src/main/scala/org/apache/spark/deploy/rest/SubmitRestProtocolMessage.scala +++ b/core/src/main/scala/org/apache/spark/deploy/rest/SubmitRestProtocolMessage.scala @@ -36,7 +36,7 @@ import org.apache.spark.util.Utils * (2) the Spark version of the client / server * (3) an optional message */ -@JsonInclude(Include.NON_ABSENT) +@JsonInclude(Include.NON_NULL) @JsonAutoDetect(getterVisibility = Visibility.ANY, setterVisibility = Visibility.ANY) @JsonPropertyOrder(alphabetic = true) private[rest] abstract class SubmitRestProtocolMessage { diff --git a/core/src/main/scala/org/apache/spark/rdd/RDDOperationScope.scala b/core/src/main/scala/org/apache/spark/rdd/RDDOperationScope.scala index 3abb2d8a11f35..53d69ba26811f 100644 --- a/core/src/main/scala/org/apache/spark/rdd/RDDOperationScope.scala +++ b/core/src/main/scala/org/apache/spark/rdd/RDDOperationScope.scala @@ -41,7 +41,7 @@ import org.apache.spark.internal.Logging * There is no particular relationship between an operation scope and a stage or a job. * A scope may live inside one stage (e.g. map) or span across multiple jobs (e.g. take). */ -@JsonInclude(Include.NON_ABSENT) +@JsonInclude(Include.NON_NULL) @JsonPropertyOrder(Array("id", "name", "parent")) private[spark] class RDDOperationScope( val name: String, diff --git a/core/src/main/scala/org/apache/spark/status/KVUtils.scala b/core/src/main/scala/org/apache/spark/status/KVUtils.scala index 45348be5c98b9..99b1843d8e1c0 100644 --- a/core/src/main/scala/org/apache/spark/status/KVUtils.scala +++ b/core/src/main/scala/org/apache/spark/status/KVUtils.scala @@ -42,7 +42,7 @@ private[spark] object KVUtils extends Logging { private[spark] class KVStoreScalaSerializer extends KVStoreSerializer { mapper.registerModule(DefaultScalaModule) - mapper.setSerializationInclusion(JsonInclude.Include.NON_ABSENT) + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL) } diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/JacksonMessageWriter.scala b/core/src/main/scala/org/apache/spark/status/api/v1/JacksonMessageWriter.scala index 50a286d0d3b0f..4560d300cb0c8 100644 --- a/core/src/main/scala/org/apache/spark/status/api/v1/JacksonMessageWriter.scala +++ b/core/src/main/scala/org/apache/spark/status/api/v1/JacksonMessageWriter.scala @@ -49,7 +49,7 @@ private[v1] class JacksonMessageWriter extends MessageBodyWriter[Object]{ } mapper.registerModule(com.fasterxml.jackson.module.scala.DefaultScalaModule) mapper.enable(SerializationFeature.INDENT_OUTPUT) - mapper.setSerializationInclusion(JsonInclude.Include.NON_ABSENT) + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL) mapper.setDateFormat(JacksonMessageWriter.makeISODateFormat) override def isWriteable( diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6 index cc88ba8c2cc63..62ae04dbc255f 100644 --- a/dev/deps/spark-deps-hadoop-2.6 +++ b/dev/deps/spark-deps-hadoop-2.6 @@ -87,16 +87,16 @@ htrace-core-3.0.4.jar httpclient-4.5.6.jar httpcore-4.4.10.jar ivy-2.4.0.jar -jackson-annotations-2.10.4.jar -jackson-core-2.10.4.jar +jackson-annotations-2.6.7.jar +jackson-core-2.6.7.jar jackson-core-asl-1.9.13.jar -jackson-databind-2.10.4.jar -jackson-dataformat-yaml-2.10.4.jar +jackson-databind-2.6.7.1.jar +jackson-dataformat-yaml-2.6.7.jar jackson-jaxrs-1.9.13.jar jackson-mapper-asl-1.9.13.jar -jackson-module-jaxb-annotations-2.10.4.jar -jackson-module-paranamer-2.10.4.jar -jackson-module-scala_2.11-2.10.4.jar +jackson-module-jaxb-annotations-2.6.7.jar +jackson-module-paranamer-2.7.9.jar +jackson-module-scala_2.11-2.6.7.1.jar jackson-xc-1.9.13.jar janino-3.0.9.jar javassist-3.18.1-GA.jar diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7 index 840275d90aa21..dcb5d63aeff4d 100644 --- a/dev/deps/spark-deps-hadoop-2.7 +++ b/dev/deps/spark-deps-hadoop-2.7 @@ -87,16 +87,16 @@ htrace-core-3.1.0-incubating.jar httpclient-4.5.6.jar httpcore-4.4.10.jar ivy-2.4.0.jar -jackson-annotations-2.10.4.jar -jackson-core-2.10.4.jar +jackson-annotations-2.6.7.jar +jackson-core-2.6.7.jar jackson-core-asl-1.9.13.jar -jackson-databind-2.10.4.jar -jackson-dataformat-yaml-2.10.4.jar +jackson-databind-2.6.7.1.jar +jackson-dataformat-yaml-2.6.7.jar jackson-jaxrs-1.9.13.jar jackson-mapper-asl-1.9.13.jar -jackson-module-jaxb-annotations-2.10.4.jar -jackson-module-paranamer-2.10.4.jar -jackson-module-scala_2.11-2.10.4.jar +jackson-module-jaxb-annotations-2.6.7.jar +jackson-module-paranamer-2.7.9.jar +jackson-module-scala_2.11-2.6.7.1.jar jackson-xc-1.9.13.jar janino-3.0.9.jar javassist-3.18.1-GA.jar diff --git a/dev/deps/spark-deps-hadoop-3.1 b/dev/deps/spark-deps-hadoop-3.1 index c059e1cfbd2b6..641b4a15ad7cd 100644 --- a/dev/deps/spark-deps-hadoop-3.1 +++ b/dev/deps/spark-deps-hadoop-3.1 @@ -86,17 +86,17 @@ htrace-core4-4.1.0-incubating.jar httpclient-4.5.6.jar httpcore-4.4.10.jar ivy-2.4.0.jar -jackson-annotations-2.10.4.jar -jackson-core-2.10.4.jar +jackson-annotations-2.6.7.jar +jackson-core-2.6.7.jar jackson-core-asl-1.9.13.jar -jackson-databind-2.10.4.jar -jackson-dataformat-yaml-2.10.4.jar -jackson-jaxrs-base-2.10.4.jar -jackson-jaxrs-json-provider-2.10.4.jar +jackson-databind-2.6.7.1.jar +jackson-dataformat-yaml-2.6.7.jar +jackson-jaxrs-base-2.7.8.jar +jackson-jaxrs-json-provider-2.7.8.jar jackson-mapper-asl-1.9.13.jar -jackson-module-jaxb-annotations-2.10.4.jar -jackson-module-paranamer-2.10.4.jar -jackson-module-scala_2.11-2.10.4.jar +jackson-module-jaxb-annotations-2.6.7.jar +jackson-module-paranamer-2.7.9.jar +jackson-module-scala_2.11-2.6.7.1.jar janino-3.0.9.jar javassist-3.18.1-GA.jar javax.annotation-api-1.2.jar diff --git a/external/docker-integration-tests/pom.xml b/external/docker-integration-tests/pom.xml index 8ced663b2b4d1..9d4f9749f21e4 100644 --- a/external/docker-integration-tests/pom.xml +++ b/external/docker-integration-tests/pom.xml @@ -22,7 +22,11 @@ org.apache.spark spark-parent_2.11 +<<<<<<< HEAD 2.4.1-kylin-r39 +======= + 2.4.1-kylin-r40 +>>>>>>> parent of a26aa4b7a5... #135 bump jackson version to 2.10.4 (#136) ../../pom.xml diff --git a/external/flume-assembly/pom.xml b/external/flume-assembly/pom.xml index 1a0e6e308d09a..35c9f5d424336 100644 --- a/external/flume-assembly/pom.xml +++ b/external/flume-assembly/pom.xml @@ -21,7 +21,11 @@ org.apache.spark spark-parent_2.11 +<<<<<<< HEAD 2.4.1-kylin-r39 +======= + 2.4.1-kylin-r40 +>>>>>>> parent of a26aa4b7a5... #135 bump jackson version to 2.10.4 (#136) ../../pom.xml diff --git a/external/flume-sink/pom.xml b/external/flume-sink/pom.xml index bb62e264671c0..d3f161385af1a 100644 --- a/external/flume-sink/pom.xml +++ b/external/flume-sink/pom.xml @@ -21,7 +21,11 @@ org.apache.spark spark-parent_2.11 +<<<<<<< HEAD 2.4.1-kylin-r39 +======= + 2.4.1-kylin-r40 +>>>>>>> parent of a26aa4b7a5... #135 bump jackson version to 2.10.4 (#136) ../../pom.xml diff --git a/external/flume/pom.xml b/external/flume/pom.xml index d544ab0c21bb8..98b12ed46f3b3 100644 --- a/external/flume/pom.xml +++ b/external/flume/pom.xml @@ -21,7 +21,11 @@ org.apache.spark spark-parent_2.11 +<<<<<<< HEAD 2.4.1-kylin-r39 +======= + 2.4.1-kylin-r40 +>>>>>>> parent of a26aa4b7a5... #135 bump jackson version to 2.10.4 (#136) ../../pom.xml diff --git a/external/kafka-0-8-assembly/pom.xml b/external/kafka-0-8-assembly/pom.xml index 9684ab24eeffc..909b81add83aa 100644 --- a/external/kafka-0-8-assembly/pom.xml +++ b/external/kafka-0-8-assembly/pom.xml @@ -21,7 +21,11 @@ org.apache.spark spark-parent_2.11 +<<<<<<< HEAD 2.4.1-kylin-r39 +======= + 2.4.1-kylin-r40 +>>>>>>> parent of a26aa4b7a5... #135 bump jackson version to 2.10.4 (#136) ../../pom.xml diff --git a/external/kafka-0-8/pom.xml b/external/kafka-0-8/pom.xml index 51f1c62f418eb..0520d93a00806 100644 --- a/external/kafka-0-8/pom.xml +++ b/external/kafka-0-8/pom.xml @@ -21,7 +21,11 @@ org.apache.spark spark-parent_2.11 +<<<<<<< HEAD 2.4.1-kylin-r39 +======= + 2.4.1-kylin-r40 +>>>>>>> parent of a26aa4b7a5... #135 bump jackson version to 2.10.4 (#136) ../../pom.xml diff --git a/external/kinesis-asl-assembly/pom.xml b/external/kinesis-asl-assembly/pom.xml index fcd63bcd5f38b..635f00c456994 100644 --- a/external/kinesis-asl-assembly/pom.xml +++ b/external/kinesis-asl-assembly/pom.xml @@ -21,7 +21,11 @@ org.apache.spark spark-parent_2.11 +<<<<<<< HEAD 2.4.1-kylin-r39 +======= + 2.4.1-kylin-r40 +>>>>>>> parent of a26aa4b7a5... #135 bump jackson version to 2.10.4 (#136) ../../pom.xml diff --git a/external/kinesis-asl/pom.xml b/external/kinesis-asl/pom.xml index c4a2aafe5b001..1d07ab63f060b 100644 --- a/external/kinesis-asl/pom.xml +++ b/external/kinesis-asl/pom.xml @@ -20,7 +20,11 @@ org.apache.spark spark-parent_2.11 +<<<<<<< HEAD 2.4.1-kylin-r39 +======= + 2.4.1-kylin-r40 +>>>>>>> parent of a26aa4b7a5... #135 bump jackson version to 2.10.4 (#136) ../../pom.xml @@ -69,13 +73,6 @@ ${aws.kinesis.producer.version} test - - - com.fasterxml.jackson.dataformat - jackson-dataformat-cbor - ${fasterxml.jackson.version} - org.mockito mockito-core diff --git a/external/spark-ganglia-lgpl/pom.xml b/external/spark-ganglia-lgpl/pom.xml index 87c6eda24bc39..452d63ff5384b 100644 --- a/external/spark-ganglia-lgpl/pom.xml +++ b/external/spark-ganglia-lgpl/pom.xml @@ -20,7 +20,11 @@ org.apache.spark spark-parent_2.11 +<<<<<<< HEAD 2.4.1-kylin-r39 +======= + 2.4.1-kylin-r40 +>>>>>>> parent of a26aa4b7a5... #135 bump jackson version to 2.10.4 (#136) ../../pom.xml diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml index 466f2c3023da7..53ee99482d362 100644 --- a/hadoop-cloud/pom.xml +++ b/hadoop-cloud/pom.xml @@ -22,7 +22,11 @@ org.apache.spark spark-parent_2.11 +<<<<<<< HEAD 2.4.1-kylin-r39 +======= + 2.4.1-kylin-r40 +>>>>>>> parent of a26aa4b7a5... #135 bump jackson version to 2.10.4 (#136) ../pom.xml diff --git a/pom.xml b/pom.xml index 5be677db7333f..36b580960a69d 100644 --- a/pom.xml +++ b/pom.xml @@ -159,7 +159,8 @@ 2.11.12 2.11 1.9.13 - 2.10.4 + 2.6.7 + 2.6.7.1 1.1.7.1 1.1.2 1.2.0-incubating @@ -641,7 +642,7 @@ com.fasterxml.jackson.core jackson-databind - ${fasterxml.jackson.version} + ${fasterxml.jackson.databind.version} com.fasterxml.jackson.core @@ -653,7 +654,7 @@ com.fasterxml.jackson.module jackson-module-scala_${scala.binary.version} - ${fasterxml.jackson.version} + ${fasterxml.jackson.databind.version} com.google.guava diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml index 212ceaf093ce0..fc20c96d78292 100644 --- a/resource-managers/kubernetes/core/pom.xml +++ b/resource-managers/kubernetes/core/pom.xml @@ -20,7 +20,11 @@ org.apache.spark spark-parent_2.11 +<<<<<<< HEAD 2.4.1-kylin-r39 +======= + 2.4.1-kylin-r40 +>>>>>>> parent of a26aa4b7a5... #135 bump jackson version to 2.10.4 (#136) ../../../pom.xml diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml index 924008dc1e6ca..2157436ea473e 100644 --- a/resource-managers/kubernetes/integration-tests/pom.xml +++ b/resource-managers/kubernetes/integration-tests/pom.xml @@ -20,7 +20,11 @@ org.apache.spark spark-parent_2.11 +<<<<<<< HEAD 2.4.1-kylin-r39 +======= + 2.4.1-kylin-r40 +>>>>>>> parent of a26aa4b7a5... #135 bump jackson version to 2.10.4 (#136) ../../../pom.xml diff --git a/resource-managers/mesos/pom.xml b/resource-managers/mesos/pom.xml index 2b1d428a1c6a4..b473eb52b498c 100644 --- a/resource-managers/mesos/pom.xml +++ b/resource-managers/mesos/pom.xml @@ -20,7 +20,11 @@ org.apache.spark spark-parent_2.11 +<<<<<<< HEAD 2.4.1-kylin-r39 +======= + 2.4.1-kylin-r40 +>>>>>>> parent of a26aa4b7a5... #135 bump jackson version to 2.10.4 (#136) ../../pom.xml diff --git a/resource-managers/yarn/pom.xml b/resource-managers/yarn/pom.xml index 24780b454569a..6ceeef08e21ef 100644 --- a/resource-managers/yarn/pom.xml +++ b/resource-managers/yarn/pom.xml @@ -20,7 +20,11 @@ org.apache.spark spark-parent_2.11 +<<<<<<< HEAD 2.4.1-kylin-r39 +======= + 2.4.1-kylin-r40 +>>>>>>> parent of a26aa4b7a5... #135 bump jackson version to 2.10.4 (#136) ../../pom.xml diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/JsonExpressionsSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/JsonExpressionsSuite.scala index c3ea57a4523cf..0e9c8abec33e4 100644 --- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/JsonExpressionsSuite.scala +++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/JsonExpressionsSuite.scala @@ -244,13 +244,6 @@ class JsonExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper with "1234") } - test("some big value") { - val value = "x" * 3000 - checkEvaluation( - GetJsonObject(NonFoldableLiteral((s"""{"big": "$value"}""")), - NonFoldableLiteral("$.big")), value) - } - val jsonTupleQuery = Literal("f1") :: Literal("f2") :: Literal("f3") :: diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/SQLListener.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/SQLListener.scala index dd0b4b6002f19..a130e64c07a9d 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/SQLListener.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/SQLListener.scala @@ -86,12 +86,12 @@ private class LongLongTupleConverter extends Converter[(Object, Object), (Long, } override def getInputType(typeFactory: TypeFactory): JavaType = { - val objectType = typeFactory.constructType(classOf[Object]) - typeFactory.constructSimpleType(classOf[(_, _)], Array(objectType, objectType)) + val objectType = typeFactory.uncheckedSimpleType(classOf[Object]) + typeFactory.constructSimpleType(classOf[(_, _)], classOf[(_, _)], Array(objectType, objectType)) } override def getOutputType(typeFactory: TypeFactory): JavaType = { - val longType = typeFactory.constructType(classOf[Long]) - typeFactory.constructSimpleType(classOf[(_, _)], Array(longType, longType)) + val longType = typeFactory.uncheckedSimpleType(classOf[Long]) + typeFactory.constructSimpleType(classOf[(_, _)], classOf[(_, _)], Array(longType, longType)) } } diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index d9102cb846fda..71d5a6f48908d 100644 --- a/sql/hive-thriftserver/pom.xml +++ b/sql/hive-thriftserver/pom.xml @@ -22,7 +22,11 @@ org.apache.spark spark-parent_2.11 +<<<<<<< HEAD 2.4.1-kylin-r39 +======= + 2.4.1-kylin-r40 +>>>>>>> parent of a26aa4b7a5... #135 bump jackson version to 2.10.4 (#136) ../../pom.xml