Revert "[SPARK-31168][SPARK-33913][BUILD] Upgrade Scala to 2.12.13 and Kafka to 2.7.0"
This reverts commit a65e86a65e
.
This commit is contained in:
parent
b2c104bd87
commit
1217c8b418
|
@ -212,10 +212,10 @@ protobuf-java/2.5.0//protobuf-java-2.5.0.jar
|
||||||
py4j/0.10.9.1//py4j-0.10.9.1.jar
|
py4j/0.10.9.1//py4j-0.10.9.1.jar
|
||||||
pyrolite/4.30//pyrolite-4.30.jar
|
pyrolite/4.30//pyrolite-4.30.jar
|
||||||
scala-collection-compat_2.12/2.1.1//scala-collection-compat_2.12-2.1.1.jar
|
scala-collection-compat_2.12/2.1.1//scala-collection-compat_2.12-2.1.1.jar
|
||||||
scala-compiler/2.12.13//scala-compiler-2.12.13.jar
|
scala-compiler/2.12.10//scala-compiler-2.12.10.jar
|
||||||
scala-library/2.12.13//scala-library-2.12.13.jar
|
scala-library/2.12.10//scala-library-2.12.10.jar
|
||||||
scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar
|
scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar
|
||||||
scala-reflect/2.12.13//scala-reflect-2.12.13.jar
|
scala-reflect/2.12.10//scala-reflect-2.12.10.jar
|
||||||
scala-xml_2.12/1.2.0//scala-xml_2.12-1.2.0.jar
|
scala-xml_2.12/1.2.0//scala-xml_2.12-1.2.0.jar
|
||||||
shapeless_2.12/2.3.3//shapeless_2.12-2.3.3.jar
|
shapeless_2.12/2.3.3//shapeless_2.12-2.3.3.jar
|
||||||
shims/0.9.0//shims-0.9.0.jar
|
shims/0.9.0//shims-0.9.0.jar
|
||||||
|
|
|
@ -182,10 +182,10 @@ protobuf-java/2.5.0//protobuf-java-2.5.0.jar
|
||||||
py4j/0.10.9.1//py4j-0.10.9.1.jar
|
py4j/0.10.9.1//py4j-0.10.9.1.jar
|
||||||
pyrolite/4.30//pyrolite-4.30.jar
|
pyrolite/4.30//pyrolite-4.30.jar
|
||||||
scala-collection-compat_2.12/2.1.1//scala-collection-compat_2.12-2.1.1.jar
|
scala-collection-compat_2.12/2.1.1//scala-collection-compat_2.12-2.1.1.jar
|
||||||
scala-compiler/2.12.13//scala-compiler-2.12.13.jar
|
scala-compiler/2.12.10//scala-compiler-2.12.10.jar
|
||||||
scala-library/2.12.13//scala-library-2.12.13.jar
|
scala-library/2.12.10//scala-library-2.12.10.jar
|
||||||
scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar
|
scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar
|
||||||
scala-reflect/2.12.13//scala-reflect-2.12.13.jar
|
scala-reflect/2.12.10//scala-reflect-2.12.10.jar
|
||||||
scala-xml_2.12/1.2.0//scala-xml_2.12-1.2.0.jar
|
scala-xml_2.12/1.2.0//scala-xml_2.12-1.2.0.jar
|
||||||
shapeless_2.12/2.3.3//shapeless_2.12-2.3.3.jar
|
shapeless_2.12/2.3.3//shapeless_2.12-2.3.3.jar
|
||||||
shims/0.9.0//shims-0.9.0.jar
|
shims/0.9.0//shims-0.9.0.jar
|
||||||
|
|
|
@ -22,7 +22,7 @@ include:
|
||||||
SPARK_VERSION: 3.2.0-SNAPSHOT
|
SPARK_VERSION: 3.2.0-SNAPSHOT
|
||||||
SPARK_VERSION_SHORT: 3.2.0
|
SPARK_VERSION_SHORT: 3.2.0
|
||||||
SCALA_BINARY_VERSION: "2.12"
|
SCALA_BINARY_VERSION: "2.12"
|
||||||
SCALA_VERSION: "2.12.13"
|
SCALA_VERSION: "2.12.10"
|
||||||
MESOS_VERSION: 1.0.0
|
MESOS_VERSION: 1.0.0
|
||||||
SPARK_ISSUE_TRACKER_URL: https://issues.apache.org/jira/browse/SPARK
|
SPARK_ISSUE_TRACKER_URL: https://issues.apache.org/jira/browse/SPARK
|
||||||
SPARK_GITHUB_URL: https://github.com/apache/spark
|
SPARK_GITHUB_URL: https://github.com/apache/spark
|
||||||
|
|
|
@ -575,11 +575,11 @@ class KafkaTestUtils(
|
||||||
s"topic $topic still exists in the replica manager")
|
s"topic $topic still exists in the replica manager")
|
||||||
// ensure that logs from all replicas are deleted if delete topic is marked successful
|
// ensure that logs from all replicas are deleted if delete topic is marked successful
|
||||||
assert(servers.forall(server => topicAndPartitions.forall(tp =>
|
assert(servers.forall(server => topicAndPartitions.forall(tp =>
|
||||||
server.getLogManager.getLog(tp).isEmpty)),
|
server.getLogManager().getLog(tp).isEmpty)),
|
||||||
s"topic $topic still exists in log manager")
|
s"topic $topic still exists in log manager")
|
||||||
// ensure that topic is removed from all cleaner offsets
|
// ensure that topic is removed from all cleaner offsets
|
||||||
assert(servers.forall(server => topicAndPartitions.forall { tp =>
|
assert(servers.forall(server => topicAndPartitions.forall { tp =>
|
||||||
val checkpoints = server.getLogManager.liveLogDirs.map { logDir =>
|
val checkpoints = server.getLogManager().liveLogDirs.map { logDir =>
|
||||||
new OffsetCheckpointFile(new File(logDir, "cleaner-offset-checkpoint")).read()
|
new OffsetCheckpointFile(new File(logDir, "cleaner-offset-checkpoint")).read()
|
||||||
}
|
}
|
||||||
checkpoints.forall(checkpointsPerLogDir => !checkpointsPerLogDir.contains(tp))
|
checkpoints.forall(checkpointsPerLogDir => !checkpointsPerLogDir.contains(tp))
|
||||||
|
|
6
pom.xml
6
pom.xml
|
@ -133,7 +133,7 @@
|
||||||
<!-- Version used for internal directory structure -->
|
<!-- Version used for internal directory structure -->
|
||||||
<hive.version.short>2.3</hive.version.short>
|
<hive.version.short>2.3</hive.version.short>
|
||||||
<!-- note that this should be compatible with Kafka brokers version 0.10 and up -->
|
<!-- note that this should be compatible with Kafka brokers version 0.10 and up -->
|
||||||
<kafka.version>2.7.0</kafka.version>
|
<kafka.version>2.6.0</kafka.version>
|
||||||
<!-- After 10.15.1.3, the minimum required version is JDK9 -->
|
<!-- After 10.15.1.3, the minimum required version is JDK9 -->
|
||||||
<derby.version>10.14.2.0</derby.version>
|
<derby.version>10.14.2.0</derby.version>
|
||||||
<parquet.version>1.10.1</parquet.version>
|
<parquet.version>1.10.1</parquet.version>
|
||||||
|
@ -162,7 +162,7 @@
|
||||||
<commons.math3.version>3.4.1</commons.math3.version>
|
<commons.math3.version>3.4.1</commons.math3.version>
|
||||||
<!-- managed up from 3.2.1 for SPARK-11652 -->
|
<!-- managed up from 3.2.1 for SPARK-11652 -->
|
||||||
<commons.collections.version>3.2.2</commons.collections.version>
|
<commons.collections.version>3.2.2</commons.collections.version>
|
||||||
<scala.version>2.12.13</scala.version>
|
<scala.version>2.12.10</scala.version>
|
||||||
<scala.binary.version>2.12</scala.binary.version>
|
<scala.binary.version>2.12</scala.binary.version>
|
||||||
<scalatest-maven-plugin.version>2.0.0</scalatest-maven-plugin.version>
|
<scalatest-maven-plugin.version>2.0.0</scalatest-maven-plugin.version>
|
||||||
<scalafmt.parameters>--test</scalafmt.parameters>
|
<scalafmt.parameters>--test</scalafmt.parameters>
|
||||||
|
@ -2557,7 +2557,7 @@
|
||||||
<compilerPlugin>
|
<compilerPlugin>
|
||||||
<groupId>com.github.ghik</groupId>
|
<groupId>com.github.ghik</groupId>
|
||||||
<artifactId>silencer-plugin_${scala.version}</artifactId>
|
<artifactId>silencer-plugin_${scala.version}</artifactId>
|
||||||
<version>1.7.1</version>
|
<version>1.6.0</version>
|
||||||
</compilerPlugin>
|
</compilerPlugin>
|
||||||
</compilerPlugins>
|
</compilerPlugins>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
|
@ -206,7 +206,7 @@ object SparkBuild extends PomBuild {
|
||||||
lazy val compilerWarningSettings: Seq[sbt.Def.Setting[_]] = Seq(
|
lazy val compilerWarningSettings: Seq[sbt.Def.Setting[_]] = Seq(
|
||||||
libraryDependencies ++= {
|
libraryDependencies ++= {
|
||||||
if (VersionNumber(scalaVersion.value).matchesSemVer(SemanticSelector("<2.13.2"))) {
|
if (VersionNumber(scalaVersion.value).matchesSemVer(SemanticSelector("<2.13.2"))) {
|
||||||
val silencerVersion = "1.7.1"
|
val silencerVersion = if (scalaBinaryVersion.value == "2.13") "1.7.1" else "1.6.0"
|
||||||
Seq(
|
Seq(
|
||||||
"org.scala-lang.modules" %% "scala-collection-compat" % "2.2.0",
|
"org.scala-lang.modules" %% "scala-collection-compat" % "2.2.0",
|
||||||
compilerPlugin("com.github.ghik" % "silencer-plugin" % silencerVersion cross CrossVersion.full),
|
compilerPlugin("com.github.ghik" % "silencer-plugin" % silencerVersion cross CrossVersion.full),
|
||||||
|
|
Loading…
Reference in a new issue