Fixes #51 - removed dead code

AbsaOSS · Aug 17, 2023 · 0b016fc · 0b016fc
1 parent 3326ab7
commit 0b016fc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/build.sbt b/build.sbt
@@ -67,15 +67,13 @@ lazy val atumAgent = (projectMatrix in file("agent"))
   .sparkRow(SparkVersionAxis(spark3), scalaVersions = Seq(scala212))
 
 lazy val atumServer = (projectMatrix in file("server"))
-  .enablePlugins(AssemblyPlugin)
   .settings(
     commonSettings ++ Seq(
       name := "atum-server",
       libraryDependencies ++= Dependencies.serverDependencies,
       (Compile / compile) := ((Compile / compile) dependsOn printScalaVersion).value,
       packageBin := (assembly in  Compile).value,
       artifactPath in (Compile, packageBin) := baseDirectory.value / s"target/${name.value}-${version.value}.war",
-//      assemblyOutputPath / assembly := baseDirectory.value / s"target/${name.value}-${version.value}.war",
       webappWebInfClasses := true,
       inheritJarManifest := true
     ): _*
@@ -84,6 +82,7 @@ lazy val atumServer = (projectMatrix in file("server"))
     jacocoReportSettings := jacocoSettings( scalaVersion.value, "atum-server"),
     jacocoExcludes := jacocoProjectExcludes()
   )
+  .enablePlugins(AssemblyPlugin)
   .enablePlugins(TomcatPlugin)
   .enablePlugins(AutomateHeaderPlugin)
   .jvmPlatform(scalaVersions = Seq(scala212))

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -30,7 +30,7 @@ object Dependencies {
   }
 
   def commonDependencies: Seq[ModuleID] = Seq(
-    "org.scalatest" %% "scalatest" % "3.2.2" % Test,
+    "org.scalatest" %% "scalatest" % "3.2.15" % Test,
     "org.mockito" %% "mockito-scala" % "1.17.12" % Test
   )
 

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -24,8 +24,6 @@ addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
 
 // Plugin to build the server module as a war file
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
-//addSbtPlugin("com.github.earldouglas" % "xsbt-web-plugin" % "5.1.1")
-//addSbtPlugin("com.typesafe.sbt" % "sbt-web" % "1.5.3")
 
 // sbt-jacoco dependency downloading
 lazy val ow2Version = "9.5"