From f4a25acedc7f1ca90a2d5e1c8422da9816d69d98 Mon Sep 17 00:00:00 2001
From: Evan Langlais <evanlanglais@gmail.com>
Date: Tue, 5 Mar 2019 21:56:53 -0500
Subject: [PATCH] Fixed assembly and dependencies

---
 assembly.sbt-bak => assembly.sbt                      |  6 +-----
 build.sbt                                             | 11 ++++++-----
 .../{application.proerties => application.properties} |  0
 3 files changed, 7 insertions(+), 10 deletions(-)
 rename assembly.sbt-bak => assembly.sbt (90%)
 rename src/main/resources/{application.proerties => application.properties} (100%)

diff --git a/assembly.sbt-bak b/assembly.sbt
similarity index 90%
rename from assembly.sbt-bak
rename to assembly.sbt
index c08c87c..b345dae 100644
--- a/assembly.sbt-bak
+++ b/assembly.sbt
@@ -1,10 +1,6 @@
-import AssemblyKeys._ 
-
-assemblySettings
-
 jarName in assembly := "PowerPanelKSO.jar"
 
-target in assembly:= file("src/universal/PowerPanel")
+target in assembly:= file("src/universal/powerpanel")
 
 mergeStrategy in assembly := {
     case PathList("javax", "servlet", xs @ _*) => MergeStrategy.last
diff --git a/build.sbt b/build.sbt
index f3b3882..0491e3c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,6 +1,6 @@
 name := "PowerPanel Data Processor"
 
-version := "0.0.1"
+version := "0.0.2"
 
 scalaVersion := "2.11.12"
 
@@ -15,18 +15,19 @@ packageZipTarball in Universal := {
 }
 
 libraryDependencies ++= Seq(
-    "org.apache.spark" %% "spark-core" % "2.4.0",
-    "org.apache.spark" %% "spark-streaming" % "2.4.0",
+    "org.apache.spark" %% "spark-core" % "2.4.0" % "provided",
+    "org.apache.spark" %% "spark-streaming" % "2.4.0" % "provided",
     "org.apache.spark" %% "spark-streaming-kafka-0-10" % "2.4.0",
     "org.apache.kafka" %% "kafka" % "2.0.0",
     "org.apache.avro" % "avro" % "1.8.2",
     "org.codehaus.jackson" % "jackson-mapper-asl" % "1.9.13",
     "joda-time" % "joda-time" % "2.7",
     "log4j" % "log4j" % "1.2.14",
-    "org.apache.httpcomponents" % "httpcore" % "4.4.6",
-    "org.apache.httpcomponents" % "httpclient" % "4.5.3"
+    "org.apache.httpcomponents" % "httpcore" % "4.4.6" % "provided",
+    "org.apache.httpcomponents" % "httpclient" % "4.5.3" % "provided"
 )
 
+
 commands += Command.command("packageApp") { state =>
       "assembly" ::
       "universal:packageZipTarball" ::
diff --git a/src/main/resources/application.proerties b/src/main/resources/application.properties
similarity index 100%
rename from src/main/resources/application.proerties
rename to src/main/resources/application.properties