From 550db10541e9988306b87c11b71ad3cff2cd38c4 Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Tue, 14 Sep 2021 14:33:02 -0700 Subject: [PATCH 1/4] [SPARK-36759][BUILD] Upgrade Scala to 2.12.15 --- dev/deps/spark-deps-hadoop-2.7-hive-2.3 | 6 +++--- dev/deps/spark-deps-hadoop-3.2-hive-2.3 | 6 +++--- pom.xml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) 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 e3ddf97ce914e..51c38c2a0f9db 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 @@ py4j/0.10.9.2//py4j-0.10.9.2.jar pyrolite/4.30//pyrolite-4.30.jar rocksdbjni/6.20.3//rocksdbjni-6.20.3.jar scala-collection-compat_2.12/2.1.1//scala-collection-compat_2.12-2.1.1.jar -scala-compiler/2.12.14//scala-compiler-2.12.14.jar -scala-library/2.12.14//scala-library-2.12.14.jar +scala-compiler/2.12.15//scala-compiler-2.12.15.jar +scala-library/2.12.15//scala-library-2.12.15.jar scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar -scala-reflect/2.12.14//scala-reflect-2.12.14.jar +scala-reflect/2.12.15//scala-reflect-2.12.15.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 e8c7ad90298a5..1e603690906d2 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 @@ py4j/0.10.9.2//py4j-0.10.9.2.jar pyrolite/4.30//pyrolite-4.30.jar rocksdbjni/6.20.3//rocksdbjni-6.20.3.jar scala-collection-compat_2.12/2.1.1//scala-collection-compat_2.12-2.1.1.jar -scala-compiler/2.12.14//scala-compiler-2.12.14.jar -scala-library/2.12.14//scala-library-2.12.14.jar +scala-compiler/2.12.15//scala-compiler-2.12.15.jar +scala-library/2.12.15//scala-library-2.12.15.jar scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar -scala-reflect/2.12.14//scala-reflect-2.12.14.jar +scala-reflect/2.12.15//scala-reflect-2.12.15.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/pom.xml b/pom.xml index 02627b48f21c6..2321523ae5c3c 100644 --- a/pom.xml +++ b/pom.xml @@ -160,7 +160,7 @@ 3.4.1 3.2.2 - 2.12.14 + 2.12.15 2.12 2.0.2 --test From 4e1f49483d1e637a14a6c7bcf585d2e51df1762d Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Tue, 14 Sep 2021 17:11:56 -0700 Subject: [PATCH 2/4] Use silencer-plugin 1.7.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2321523ae5c3c..86817fd0d0ed8 100644 --- a/pom.xml +++ b/pom.xml @@ -2648,7 +2648,7 @@ com.github.ghik silencer-plugin_${scala.version} - 1.7.5 + 1.7.6 From 623c77aa27afc3787faf0413fd7871aae1881409 Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Wed, 15 Sep 2021 07:39:31 -0700 Subject: [PATCH 3/4] empty commit From bc679e3ab25d48c81fd25fc701cc756bc39e2534 Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Wed, 15 Sep 2021 08:00:46 -0700 Subject: [PATCH 4/4] Update SparkBuild.scala --- project/SparkBuild.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 2f82b1ce9c18f..b9068cc95bd53 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -208,7 +208,7 @@ object SparkBuild extends PomBuild { lazy val compilerWarningSettings: Seq[sbt.Def.Setting[_]] = Seq( libraryDependencies ++= { if (VersionNumber(scalaVersion.value).matchesSemVer(SemanticSelector("<2.13.2"))) { - val silencerVersion = "1.7.5" + val silencerVersion = "1.7.6" Seq( "org.scala-lang.modules" %% "scala-collection-compat" % "2.2.0", compilerPlugin("com.github.ghik" % "silencer-plugin" % silencerVersion cross CrossVersion.full),