Merge pull request #156 from colorant/fixname

rxin · rxin · commit b88bc39e224f · 2013-09-15T06:33:18.000-07:00
Fix name for non assembly jar.
diff --git a/project/SharkBuild.scala b/project/SharkBuild.scala
@@ -118,7 +118,6 @@ object SharkBuild extends Build {
   )
 
   def assemblyProjSettings = Seq(
-    name := "shark-assembly",
     jarName in assembly <<= version map { v => "shark-assembly-" + v + "-hadoop" + HADOOP_VERSION + ".jar" }
   ) ++ assemblySettings ++ extraAssemblySettings
 

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,6 @@ object SharkBuild extends Build {`
`118`	`118`	`)`
`119`	`119`
`120`	`120`	`def assemblyProjSettings = Seq(`
`121`		`- name := "shark-assembly",`
`122`	`121`	`jarName in assembly <<= version map { v => "shark-assembly-" + v + "-hadoop" + HADOOP_VERSION + ".jar" }`
`123`	`122`	`) ++ assemblySettings ++ extraAssemblySettings`
`124`	`123`