Skip to content

Commit 1529945

Browse files
wangyumpanbingkunwayneguow
authored and
GitHub Enterprise
committed
[HADP-54080][SPARK-48826] Upgrade jackson-databind to 2.17.2 (apache#433)
* [SPARK-45967][BUILD] Upgrade jackson to 2.16.0 ### What changes were proposed in this pull request? The pr aims to upgrade FasterXML jackson from 2.15.2 to 2.16.0. ### Why are the changes needed? New version that fix some bugs, release notes as follows: - 2.1.6.0 https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.16, eg: [Databind](https://github.com/FasterXML/jackson-databind) [apache#1770](FasterXML/jackson-databind#1770): Incorrect deserialization for BigDecimal numbers - 2.15.3 https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.15.3, eg: [Databind](https://github.com/FasterXML/jackson-databind) [apache#3968](FasterXML/jackson-databind#3968): Records with additional constructors failed to deserialize The last upgrade occurred 6 months ago, apache#41414 ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass GA. ### Was this patch authored or co-authored using generative AI tooling? No. Closes apache#43859 from panbingkun/SPARK-45967. Authored-by: panbingkun <pbk1982@gmail.com> Signed-off-by: Dongjoon Hyun <dhyun@apple.com> (cherry picked from commit c17b092) * [SPARK-48826][BUILD] Upgrade `fasterxml.jackson` to 2.17.2 ### What changes were proposed in this pull request? This PR amis to upgrade `fasterxml.jackson` from 2.17.1 to 2.17.2. ### Why are the changes needed? There are some bug fixes about [Databind](https://github.com/FasterXML/jackson-databind): [apache#4561](FasterXML/jackson-databind#4561): Issues using jackson-databind 2.17.1 with Reactor (wrt DeserializerCache and ReentrantLock) [apache#4575](FasterXML/jackson-databind#4575): StdDelegatingSerializer does not consider a Converter that may return null for a non-null input [apache#4577](FasterXML/jackson-databind#4577): Cannot deserialize value of type java.math.BigDecimal from String "3." (not a valid representation) [apache#4595](FasterXML/jackson-databind#4595): No way to explicitly disable wrapping in custom annotation processor [apache#4607](FasterXML/jackson-databind#4607): MismatchedInput: No Object Id found for an instance of X to assign to property 'id' [apache#4610](FasterXML/jackson-databind#4610): DeserializationFeature.FAIL_ON_UNRESOLVED_OBJECT_IDS does not work when used with Polymorphic type handling The full release note of 2.17.2: https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.17.2 ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass GA. ### Was this patch authored or co-authored using generative AI tooling? No. Closes apache#47241 from wayneguow/upgrade_jackson. Authored-by: Wei Guo <guow93@gmail.com> Signed-off-by: yangjie01 <yangjie01@baidu.com> (cherry picked from commit 65daff5) * fix --------- Co-authored-by: panbingkun <pbk1982@gmail.com> Co-authored-by: Wei Guo <guow93@gmail.com>
1 parent 632a8a6 commit 1529945

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

‎dev/deps/spark-deps-hadoop-3-hive-2.3‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,15 @@ httpcore/4.4.16//httpcore-4.4.16.jar
103103
ini4j/0.5.4//ini4j-0.5.4.jar
104104
istack-commons-runtime/3.0.8//istack-commons-runtime-3.0.8.jar
105105
ivy/2.5.1//ivy-2.5.1.jar
106-
jackson-annotations/2.15.2//jackson-annotations-2.15.2.jar
106+
jackson-annotations/2.17.2//jackson-annotations-2.17.2.jar
107107
jackson-core-asl/1.9.13//jackson-core-asl-1.9.13.jar
108-
jackson-core/2.15.2//jackson-core-2.15.2.jar
109-
jackson-databind/2.15.2//jackson-databind-2.15.2.jar
110-
jackson-dataformat-cbor/2.15.2//jackson-dataformat-cbor-2.15.2.jar
111-
jackson-dataformat-yaml/2.15.2//jackson-dataformat-yaml-2.15.2.jar
112-
jackson-datatype-jsr310/2.15.2//jackson-datatype-jsr310-2.15.2.jar
108+
jackson-core/2.17.2//jackson-core-2.17.2.jar
109+
jackson-databind/2.17.2//jackson-databind-2.17.2.jar
110+
jackson-dataformat-cbor/2.17.2//jackson-dataformat-cbor-2.17.2.jar
111+
jackson-dataformat-yaml/2.17.2//jackson-dataformat-yaml-2.17.2.jar
112+
jackson-datatype-jsr310/2.17.2//jackson-datatype-jsr310-2.17.2.jar
113113
jackson-mapper-asl/1.9.13//jackson-mapper-asl-1.9.13.jar
114-
jackson-module-scala_2.12/2.15.2//jackson-module-scala_2.12-2.15.2.jar
114+
jackson-module-scala_2.12/2.17.2//jackson-module-scala_2.12-2.17.2.jar
115115
jakarta.annotation-api/1.3.5//jakarta.annotation-api-1.3.5.jar
116116
jakarta.inject/2.6.1//jakarta.inject-2.6.1.jar
117117
jakarta.servlet-api/4.0.3//jakarta.servlet-api-4.0.3.jar
@@ -254,7 +254,7 @@ shims/0.9.45//shims-0.9.45.jar
254254
slf4j-api/2.0.7//slf4j-api-2.0.7.jar
255255
slf4j-log4j12/1.7.25//slf4j-log4j12-1.7.25.jar
256256
snakeyaml-engine/2.6//snakeyaml-engine-2.6.jar
257-
snakeyaml/2.0//snakeyaml-2.0.jar
257+
snakeyaml/2.2//snakeyaml-2.2.jar
258258
snappy-java/1.1.10.5//snappy-java-1.1.10.5.jar
259259
spire-macros_2.12/0.17.0//spire-macros_2.12-0.17.0.jar
260260
spire-platform_2.12/0.17.0//spire-platform_2.12-0.17.0.jar

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@
199199
<scalafmt.validateOnly>true</scalafmt.validateOnly>
200200
<scalafmt.changedOnly>true</scalafmt.changedOnly>
201201
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
202-
<fasterxml.jackson.version>2.15.2</fasterxml.jackson.version>
203-
<fasterxml.jackson.databind.version>2.15.2</fasterxml.jackson.databind.version>
202+
<fasterxml.jackson.version>2.17.2</fasterxml.jackson.version>
203+
<fasterxml.jackson.databind.version>2.17.2</fasterxml.jackson.databind.version>
204204
<snappy.version>1.1.10.5</snappy.version>
205205
<netlib.ludovic.dev.version>3.0.3</netlib.ludovic.dev.version>
206206
<commons-codec.version>1.17.0</commons-codec.version>

‎sql/core/src/test/scala/org/apache/spark/sql/JsonFunctionsSuite.scala‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,7 +1218,8 @@ class JsonFunctionsSuite extends QueryTest with SharedSparkSession {
12181218
val invalidDataType = "MAP<INT, cow>"
12191219
val invalidDataTypeReason = "Unrecognized token 'MAP': " +
12201220
"was expecting (JSON String, Number, Array, Object or token 'null', 'true' or 'false')\n " +
1221-
"at [Source: (String)\"MAP<INT, cow>\"; line: 1, column: 4]"
1221+
"at [Source: REDACTED (`StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION` disabled); " +
1222+
"line: 1, column: 4]"
12221223
checkError(
12231224
exception = intercept[AnalysisException] {
12241225
df.select(from_json($"json", invalidDataType, Map.empty[String, String])).collect()
@@ -1233,7 +1234,8 @@ class JsonFunctionsSuite extends QueryTest with SharedSparkSession {
12331234
val invalidTableSchema = "x INT, a cow"
12341235
val invalidTableSchemaReason = "Unrecognized token 'x': " +
12351236
"was expecting (JSON String, Number, Array, Object or token 'null', 'true' or 'false')\n" +
1236-
" at [Source: (String)\"x INT, a cow\"; line: 1, column: 2]"
1237+
" at [Source: REDACTED (`StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION` disabled); " +
1238+
"line: 1, column: 2]"
12371239
checkError(
12381240
exception = intercept[AnalysisException] {
12391241
df.select(from_json($"json", invalidTableSchema, Map.empty[String, String])).collect()

0 commit comments

Comments
 (0)