Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed assembly and dependencies
  • Loading branch information
Evan Langlais committed Mar 6, 2019
1 parent af640d8 commit f4a25ac
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
6 changes: 1 addition & 5 deletions assembly.sbt-bak → 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
Expand Down
11 changes: 6 additions & 5 deletions build.sbt
@@ -1,6 +1,6 @@
name := "PowerPanel Data Processor"

version := "0.0.1"
version := "0.0.2"

scalaVersion := "2.11.12"

Expand All @@ -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" ::
Expand Down
File renamed without changes.

0 comments on commit f4a25ac

Please sign in to comment.