Skip to content

Commit

Permalink
Fixed assembly deduplication errors and assembly syntax.
Browse files Browse the repository at this point in the history
  • Loading branch information
manuelkiessling committed Jan 4, 2017
1 parent 74723a1 commit 15d6ef8
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ val commonSettings = Seq(
scalacOptions := Seq("-target:jvm-1.8", "-unchecked", "-deprecation", "-encoding", "utf8"),
// stole the following from https://github.com/datastax/spark-cassandra-connector/pull/858/files
// in order to avoid assembly merge errors with netty
assemblyMergeStrategy in assembly <<= (mergeStrategy in assembly) { (old) =>
{
case PathList("META-INF", "io.netty.versions.properties") => MergeStrategy.last
case x => old(x)
}
assemblyMergeStrategy in assembly := {
case PathList("META-INF", "io.netty.versions.properties") => MergeStrategy.last
case x =>
val oldStrategy = (assemblyMergeStrategy in assembly).value
oldStrategy(x)
}
)

Expand All @@ -22,7 +22,8 @@ lazy val testDependencies = Seq (

lazy val cassandraDependencies = Seq (
"com.datastax.cassandra" % "cassandra-driver-core" % "3.1.2",
"de.kaufhof" %% "pillar" % "3.3.0"
// Exclusion of jline needed to avoid assembly deduplication errors for libjansi.so, libjansi.jnilib, jansi.dll
"de.kaufhof" %% "pillar" % "3.3.0" exclude("jline", "jline")
)

lazy val json4sDependencies = Seq (
Expand Down

0 comments on commit 15d6ef8

Please sign in to comment.