Merge branch 'main' into dependabot/github_actions/scalacenter/sbt-de…

…pendency-submission-3
htrc · Sep 25, 2024 · 154e13e · 154e13e
2 parents 00d8462 + a43ec2c
commit 154e13e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -1,23 +1,23 @@
-import sbt.Keys._
-import sbt._
+import sbt.Keys.*
+import sbt.*
 
 object Dependencies {
 
   def spark(version: String): Seq[Def.Setting[Seq[ModuleID]]] = Seq(
     libraryDependencies ++= Seq(
-      "org.apache.spark" %% "spark-core"      % version % Provided
-        exclude("org.slf4j", "slf4j-log4j12"),
+      "org.apache.spark" %% "spark-core"      % version % Provided,
       "org.apache.spark" %% "spark-sql"       % version % Provided
-        exclude("org.slf4j", "slf4j-log4j12")
     )
   )
 
   def spark_dev(version: String): Seq[Def.Setting[Seq[ModuleID]]] = Seq(
     libraryDependencies ++= Seq(
       "org.apache.spark" %% "spark-core"      % version
-        exclude("org.slf4j", "slf4j-log4j12"),
+        exclude("org.slf4j", "slf4j-log4j12")
+        exclude("org.apache.logging.log4j", "log4j-slf4j2-impl"),
       "org.apache.spark" %% "spark-sql"       % version
         exclude("org.slf4j", "slf4j-log4j12")
+        exclude("org.apache.logging.log4j", "log4j-slf4j2-impl")
     )
   )
 

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.0
+sbt.version=1.10.2
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,9 +1,5 @@
 logLevel := Level.Warn
 
-ThisBuild / libraryDependencySchemes ++= Seq(
-  "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
-)
-
 addSbtPlugin("com.github.sbt"         % "sbt-git"             % "2.0.1")
 addSbtPlugin("com.github.sbt"         % "sbt-native-packager" % "1.10.0")
 addSbtPlugin("com.eed3si9n"           % "sbt-assembly"        % "2.2.0")