From 08d2f80c248d2504f207d6b7d48e396a9ad57a86 Mon Sep 17 00:00:00 2001 From: panbingkun Date: Fri, 17 Nov 2023 09:59:08 +0800 Subject: [PATCH 1/5] [SPARK-45967][BUILD] Upgrade jackson to 2.16.0 --- dev/deps/spark-deps-hadoop-3-hive-2.3 | 14 +++++++------- pom.xml | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3 index eeb962cd62cec..13d7ad7f5c121 100644 --- a/dev/deps/spark-deps-hadoop-3-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3-hive-2.3 @@ -98,15 +98,15 @@ httpcore/4.4.16//httpcore-4.4.16.jar ini4j/0.5.4//ini4j-0.5.4.jar istack-commons-runtime/3.0.8//istack-commons-runtime-3.0.8.jar ivy/2.5.1//ivy-2.5.1.jar -jackson-annotations/2.15.2//jackson-annotations-2.15.2.jar +jackson-annotations/2.16.0//jackson-annotations-2.16.0.jar jackson-core-asl/1.9.13//jackson-core-asl-1.9.13.jar -jackson-core/2.15.2//jackson-core-2.15.2.jar -jackson-databind/2.15.2//jackson-databind-2.15.2.jar -jackson-dataformat-cbor/2.15.2//jackson-dataformat-cbor-2.15.2.jar -jackson-dataformat-yaml/2.15.2//jackson-dataformat-yaml-2.15.2.jar -jackson-datatype-jsr310/2.15.2//jackson-datatype-jsr310-2.15.2.jar +jackson-core/2.16.0//jackson-core-2.16.0.jar +jackson-databind/2.16.0//jackson-databind-2.16.0.jar +jackson-dataformat-cbor/2.16.0//jackson-dataformat-cbor-2.16.0.jar +jackson-dataformat-yaml/2.16.0//jackson-dataformat-yaml-2.16.0.jar +jackson-datatype-jsr310/2.16.0//jackson-datatype-jsr310-2.16.0.jar jackson-mapper-asl/1.9.13//jackson-mapper-asl-1.9.13.jar -jackson-module-scala_2.13/2.15.2//jackson-module-scala_2.13-2.15.2.jar +jackson-module-scala_2.13/2.16.0//jackson-module-scala_2.13-2.16.0.jar jakarta.annotation-api/1.3.5//jakarta.annotation-api-1.3.5.jar jakarta.inject/2.6.1//jakarta.inject-2.6.1.jar jakarta.servlet-api/4.0.3//jakarta.servlet-api-4.0.3.jar diff --git a/pom.xml b/pom.xml index 7615904e610fd..14ee601b8d977 100644 --- a/pom.xml +++ b/pom.xml @@ -185,8 +185,8 @@ true true 1.9.13 - 2.15.2 - 2.15.2 + 2.16.0 + 2.16.0 2.3.0 3.0.2 1.1.10.5 From c66c663ba3b5ed18584d0bcff7fbc5539f8ed35f Mon Sep 17 00:00:00 2001 From: panbingkun Date: Fri, 17 Nov 2023 11:25:56 +0800 Subject: [PATCH 2/5] [SPARK-45967][BUILD] Upgrade jackson to 2.16.0 --- dev/deps/spark-deps-hadoop-3-hive-2.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3 index 13d7ad7f5c121..8909018a99f44 100644 --- a/dev/deps/spark-deps-hadoop-3-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3-hive-2.3 @@ -243,7 +243,7 @@ scala-reflect/2.13.12//scala-reflect-2.13.12.jar scala-xml_2.13/2.2.0//scala-xml_2.13-2.2.0.jar slf4j-api/2.0.9//slf4j-api-2.0.9.jar snakeyaml-engine/2.7//snakeyaml-engine-2.7.jar -snakeyaml/2.0//snakeyaml-2.0.jar +snakeyaml/2.2//snakeyaml-2.2.jar snappy-java/1.1.10.5//snappy-java-1.1.10.5.jar spire-macros_2.13/0.18.0//spire-macros_2.13-0.18.0.jar spire-platform_2.13/0.18.0//spire-platform_2.13-0.18.0.jar From b9691e296b425deff7b416c62f5765770212ac10 Mon Sep 17 00:00:00 2001 From: panbingkun Date: Fri, 17 Nov 2023 20:55:03 +0800 Subject: [PATCH 3/5] [SPARK-45967][BUILD] Upgrade jackson to 2.16.0 --- .../scala/org/apache/spark/sql/JsonFunctionsSuite.scala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sql/core/src/test/scala/org/apache/spark/sql/JsonFunctionsSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/JsonFunctionsSuite.scala index 933f362db663f..87593afb332df 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/JsonFunctionsSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/JsonFunctionsSuite.scala @@ -1175,7 +1175,8 @@ class JsonFunctionsSuite extends QueryTest with SharedSparkSession { val invalidDataType = "MAP" val invalidDataTypeReason = "Unrecognized token 'MAP': " + "was expecting (JSON String, Number, Array, Object or token 'null', 'true' or 'false')\n " + - "at [Source: (String)\"MAP\"; line: 1, column: 4]" + "at [Source: REDACTED (`StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION` disabled); " + + "line: 1, column: 4]" checkError( exception = intercept[AnalysisException] { df.select(from_json($"json", invalidDataType, Map.empty[String, String])).collect() @@ -1190,7 +1191,8 @@ class JsonFunctionsSuite extends QueryTest with SharedSparkSession { val invalidTableSchema = "x INT, a cow" val invalidTableSchemaReason = "Unrecognized token 'x': " + "was expecting (JSON String, Number, Array, Object or token 'null', 'true' or 'false')\n" + - " at [Source: (String)\"x INT, a cow\"; line: 1, column: 2]" + " at [Source: REDACTED (`StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION` disabled); " + + "line: 1, column: 2]" checkError( exception = intercept[AnalysisException] { df.select(from_json($"json", invalidTableSchema, Map.empty[String, String])).collect() From 1adbd6bcf3c5b8735070751797c1506184f01c18 Mon Sep 17 00:00:00 2001 From: panbingkun Date: Fri, 17 Nov 2023 23:49:01 +0800 Subject: [PATCH 4/5] Trigger build From 7bd4a3c6e19b3c3f22d64c1c37e12bdaf5f9e4e0 Mon Sep 17 00:00:00 2001 From: panbingkun Date: Fri, 17 Nov 2023 23:49:25 +0800 Subject: [PATCH 5/5] Trigger build