This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 7996b031f7f2 [SPARK-47706][BUILD] Bump json4s 4.0.7
7996b031f7f2 is described below
commit 7996b031f7f227d0f4112104c6fc5ab160fc84c9
Author: Cheng Pan <cheng...@apache.org>
AuthorDate: Tue Apr 9 23:03:04 2024 -0700
[SPARK-47706][BUILD] Bump json4s 4.0.7
### What changes were proposed in this pull request?
Bump json4s from 3.7.0-M11 to 4.0.7
### Why are the changes needed?
4.0.7 is the latest stable version of json4s.
https://mvnrepository.com/artifact/org.json4s/json4s-jackson
### Does this PR introduce _any_ user-facing change?
No, all Mima complaints are private API.
### How was this patch tested?
Pass GHA.
### Was this patch authored or co-authored using generative AI tooling?
No
Closes #45838 from pan3793/SPARK-47706.
Authored-by: Cheng Pan <cheng...@apache.org>
Signed-off-by: Dongjoon Hyun <dh...@apple.com>
---
.../org/apache/spark/sql/protobuf/ProtobufFunctionsSuite.scala | 3 +--
dev/deps/spark-deps-hadoop-3-hive-2.3 | 9 +++++----
pom.xml | 2 +-
project/MimaExcludes.scala | 6 +++++-
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git
a/connector/protobuf/src/test/scala/org/apache/spark/sql/protobuf/ProtobufFunctionsSuite.scala
b/connector/protobuf/src/test/scala/org/apache/spark/sql/protobuf/ProtobufFunctionsSuite.scala
index fb8a68f1812b..5233e0688349 100644
---
a/connector/protobuf/src/test/scala/org/apache/spark/sql/protobuf/ProtobufFunctionsSuite.scala
+++
b/connector/protobuf/src/test/scala/org/apache/spark/sql/protobuf/ProtobufFunctionsSuite.scala
@@ -22,7 +22,6 @@ import java.time.Duration
import scala.jdk.CollectionConverters._
import com.google.protobuf.{Any => AnyProto, BoolValue, ByteString,
BytesValue, DoubleValue, DynamicMessage, FloatValue, Int32Value, Int64Value,
StringValue, UInt32Value, UInt64Value}
-import org.json4s.StringInput
import org.json4s.jackson.JsonMethods
import org.apache.spark.sql.{AnalysisException, Column, DataFrame, QueryTest,
Row}
@@ -1339,7 +1338,7 @@ class ProtobufFunctionsSuite extends QueryTest with
SharedSparkSession with Prot
// Takes json string and return a json with all the extra whitespace
removed.
def compactJson(json: String): String = {
- val jsonValue = JsonMethods.parse(StringInput(json))
+ val jsonValue = JsonMethods.parse(json)
JsonMethods.compact(jsonValue)
}
diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3
b/dev/deps/spark-deps-hadoop-3-hive-2.3
index 0decaaea6fd6..e51943fb0afe 100644
--- a/dev/deps/spark-deps-hadoop-3-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-3-hive-2.3
@@ -147,10 +147,11 @@ joda-time/2.12.7//joda-time-2.12.7.jar
jodd-core/3.5.2//jodd-core-3.5.2.jar
jpam/1.1//jpam-1.1.jar
json/1.8//json-1.8.jar
-json4s-ast_2.13/3.7.0-M11//json4s-ast_2.13-3.7.0-M11.jar
-json4s-core_2.13/3.7.0-M11//json4s-core_2.13-3.7.0-M11.jar
-json4s-jackson_2.13/3.7.0-M11//json4s-jackson_2.13-3.7.0-M11.jar
-json4s-scalap_2.13/3.7.0-M11//json4s-scalap_2.13-3.7.0-M11.jar
+json4s-ast_2.13/4.0.7//json4s-ast_2.13-4.0.7.jar
+json4s-core_2.13/4.0.7//json4s-core_2.13-4.0.7.jar
+json4s-jackson-core_2.13/4.0.7//json4s-jackson-core_2.13-4.0.7.jar
+json4s-jackson_2.13/4.0.7//json4s-jackson_2.13-4.0.7.jar
+json4s-scalap_2.13/4.0.7//json4s-scalap_2.13-4.0.7.jar
jsr305/3.0.0//jsr305-3.0.0.jar
jta/1.1//jta-1.1.jar
jul-to-slf4j/2.0.12//jul-to-slf4j-2.0.12.jar
diff --git a/pom.xml b/pom.xml
index 9202823b38c5..7b588e80e7ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1119,7 +1119,7 @@
<dependency>
<groupId>org.json4s</groupId>
<artifactId>json4s-jackson_${scala.binary.version}</artifactId>
- <version>3.7.0-M11</version>
+ <version>4.0.7</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/project/MimaExcludes.scala b/project/MimaExcludes.scala
index 4016c5f8b3e5..a907adea2c50 100644
--- a/project/MimaExcludes.scala
+++ b/project/MimaExcludes.scala
@@ -84,7 +84,11 @@ object MimaExcludes {
ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.sql.jdbc.MySQLDialect#MySQLSQLBuilder.this"),
ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.sql.jdbc.MySQLDialect#MySQLSQLQueryBuilder.this"),
ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.sql.jdbc.OracleDialect#OracleSQLBuilder.this"),
-
ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.sql.jdbc.OracleDialect#OracleSQLQueryBuilder.this")
+
ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.sql.jdbc.OracleDialect#OracleSQLQueryBuilder.this"),
+ // SPARK-47706: Bump json4s from 3.7.0-M11 to 4.0.7
+
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.spark.sql.expressions.MutableAggregationBuffer.jsonValue"),
+
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.spark.sql.types.DataType#JSortedObject.unapplySeq"),
+
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.spark.mllib.tree.model.TreeEnsembleModel#SaveLoadV1_0.readMetadata")
)
// Default exclude rules
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
