Skip to content

Commit f520fd9

Browse files
Egor Krivokonekrivokonmapr
authored andcommitted
Spark 3.2.0 porting
1 parent a1cd79b commit f520fd9

File tree

3 files changed

+4
-14
lines changed

3 files changed

+4
-14
lines changed

external/kafka-0-10-token-provider/pom.xml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,6 @@
7474
<artifactId>spark-tags_${scala.binary.version}</artifactId>
7575
</dependency>
7676

77-
<dependency>
78-
<groupId>org.apache.spark</groupId>
79-
<artifactId>spark-tags_${scala.binary.version}</artifactId>
80-
</dependency>
81-
82-
<dependency>
83-
<groupId>org.apache.hadoop</groupId>
84-
<artifactId>hadoop-common</artifactId>
85-
<version>${hadoop.version}</version>
86-
<scope>provided</scope>
87-
</dependency>
8877
<!--
8978
This spark-tags test-dep is needed even though it isn't used in this module, otherwise testing-cmds that exclude
9079
them will yield errors.

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2792,9 +2792,9 @@
27922792
<configuration>
27932793
<rules>
27942794
<bannedDependencies>
2795-
<excludes>
2796-
<exclude>org.apache.hadoop:hadoop*:*:jar:compile</exclude>
2797-
</excludes>
2795+
<!-- <excludes>-->
2796+
<!-- <exclude>org.apache.hadoop:hadoop*:*:jar:compile</exclude>-->
2797+
<!-- </excludes>-->
27982798
</bannedDependencies>
27992799
</rules>
28002800
<fail>true</fail>

sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveExternalCatalogVersionsSuite.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import org.scalatest.time.Span
3030
import org.scalatest.time.SpanSugar._
3131

3232
import org.apache.spark.{SparkConf, TestUtils}
33+
import org.apache.spark.deploy.SparkSubmitTestUtils
3334
import org.apache.spark.internal.config.MASTER_REST_SERVER_ENABLED
3435
import org.apache.spark.internal.config.UI.UI_ENABLED
3536
import org.apache.spark.launcher.JavaModuleOptions

0 commit comments

Comments
 (0)