Fix merge conflicts

apache · hvanhovell · Jul 24, 2023 · Jul 24, 2023 · Jul 24, 2023 · Jul 24, 2023
commit 24b3cc7b127896bbbc6cb0031e04a2fdcbad906a
diff --git a/project/MimaExcludes.scala b/project/MimaExcludes.scala
@@ -67,7 +67,10 @@ object MimaExcludes {
     ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.sql.types.DecimalType.unapply"),
     // [SPARK-44507][SQL][CONNECT] Move AnalysisException to sql/api.
     ProblemFilters.exclude[MissingClassProblem]("org.apache.spark.sql.AnalysisException"),
-    ProblemFilters.exclude[MissingClassProblem]("org.apache.spark.sql.AnalysisException$")
+    ProblemFilters.exclude[MissingClassProblem]("org.apache.spark.sql.AnalysisException$"),
+    // [SPARK-44535][CONNECT][SQL] Move required Streaming API to sql/api
+    ProblemFilters.exclude[MissingClassProblem]("org.apache.spark.sql.streaming.GroupStateTimeout"),
+    ProblemFilters.exclude[MissingClassProblem]("org.apache.spark.sql.streaming.OutputMode")
   )
 
   // Default exclude rules