diff --git a/dev/deps/spark-deps-hadoop-2.7-hive-2.3 b/dev/deps/spark-deps-hadoop-2.7-hive-2.3 index db9df83781fdf..c77107182ac2a 100644 --- a/dev/deps/spark-deps-hadoop-2.7-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-2.7-hive-2.3 @@ -212,10 +212,10 @@ protobuf-java/2.5.0//protobuf-java-2.5.0.jar py4j/0.10.9.2//py4j-0.10.9.2.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-compiler/2.12.10//scala-compiler-2.12.10.jar -scala-library/2.12.10//scala-library-2.12.10.jar +scala-compiler/2.12.14//scala-compiler-2.12.14.jar +scala-library/2.12.14//scala-library-2.12.14.jar scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar -scala-reflect/2.12.10//scala-reflect-2.12.10.jar +scala-reflect/2.12.14//scala-reflect-2.12.14.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 shims/0.9.0//shims-0.9.0.jar diff --git a/dev/deps/spark-deps-hadoop-3.2-hive-2.3 b/dev/deps/spark-deps-hadoop-3.2-hive-2.3 index 5dc97184db3bb..53e2ea317d68f 100644 --- a/dev/deps/spark-deps-hadoop-3.2-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3.2-hive-2.3 @@ -183,10 +183,10 @@ protobuf-java/2.5.0//protobuf-java-2.5.0.jar py4j/0.10.9.2//py4j-0.10.9.2.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-compiler/2.12.10//scala-compiler-2.12.10.jar -scala-library/2.12.10//scala-library-2.12.10.jar +scala-compiler/2.12.14//scala-compiler-2.12.14.jar +scala-library/2.12.14//scala-library-2.12.14.jar scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar -scala-reflect/2.12.10//scala-reflect-2.12.10.jar +scala-reflect/2.12.14//scala-reflect-2.12.14.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 shims/0.9.0//shims-0.9.0.jar diff --git a/docs/_config.yml b/docs/_config.yml index a8d42e483d17d..72ed49c866bcb 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -22,7 +22,7 @@ include: SPARK_VERSION: 3.2.0-SNAPSHOT SPARK_VERSION_SHORT: 3.2.0 SCALA_BINARY_VERSION: "2.12" -SCALA_VERSION: "2.12.10" +SCALA_VERSION: "2.12.14" MESOS_VERSION: 1.0.0 SPARK_ISSUE_TRACKER_URL: https://issues.apache.org/jira/browse/SPARK SPARK_GITHUB_URL: https://github.com/apache/spark diff --git a/pom.xml b/pom.xml index 62b17d53c58f5..ffe83d167ea80 100644 --- a/pom.xml +++ b/pom.xml @@ -162,7 +162,7 @@ 3.4.1 3.2.2 - 2.12.10 + 2.12.14 2.12 2.0.0 --test @@ -2618,7 +2618,7 @@ com.github.ghik silencer-plugin_${scala.version} - 1.6.0 + 1.7.5 diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index e2e18d557273e..76fdc097ce3c8 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -203,13 +203,12 @@ object SparkBuild extends PomBuild { // Silencer: Scala compiler plugin for warning suppression // Aim: enable fatal warnings, but suppress ones related to using of deprecated APIs // depends on scala version: - // <2.13 - silencer 1.6.0 and compiler settings to enable fatal warnings - // 2.13.0,2.13.1 - silencer 1.7.1 and compiler settings to enable fatal warnings + // <2.13.2 - silencer 1.7.5 and compiler settings to enable fatal warnings // 2.13.2+ - no silencer and configured warnings to achieve the same lazy val compilerWarningSettings: Seq[sbt.Def.Setting[_]] = Seq( libraryDependencies ++= { if (VersionNumber(scalaVersion.value).matchesSemVer(SemanticSelector("<2.13.2"))) { - val silencerVersion = if (scalaBinaryVersion.value == "2.13") "1.7.1" else "1.6.0" + val silencerVersion = "1.7.5" Seq( "org.scala-lang.modules" %% "scala-collection-compat" % "2.2.0", compilerPlugin("com.github.ghik" % "silencer-plugin" % silencerVersion cross CrossVersion.full),