Merge remote-tracking branch 'origin/b1.6'

christobill · Aug 31, 2016 · f83bf4b · f83bf4b
2 parents 4ee3efe + fdb6c1e
commit f83bf4b
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/project/SparkCassandraConnectorBuild.scala b/project/SparkCassandraConnectorBuild.scala
@@ -84,17 +84,11 @@ object CassandraSparkBuild extends Build {
         log.info(s"""Shaded jar moved to $expected""".stripMargin)
         expected
       },
+      packagedArtifact in packageBin in Compile := {
+        (artifact.value, (assembly in shadedConnector).value)
+      },
       sbt.Keys.`package` := packageBin.value)
       ++ pureCassandraSettings
-      //Update the distribution tasks to use the shaded jar
-      ++ {for (taskKey <- Seq(publishLocal in Compile, publish in Compile, publishM2 in Compile)) yield {
-      packagedArtifacts in taskKey := {
-        val previous = (packagedArtifacts in Compile).value
-        val shadedJar = (artifact.value.copy(configurations = Seq(Compile)) -> packageBin.value)
-        //Clobber the old build artifact with the shaded jar
-        previous + shadedJar
-      }
-    }}
   ).copy(dependencies = Seq(embedded % "test->test;it->it,test;")
   ) configs IntegrationTest