fix beeline version when sbt

Author: scwf

project/SparkBuild.scala

@@ -273,13 +273,14 @@ object Assembly {
     jarName in assembly <<= (version, moduleName) map { (v, mName) => mName + "-"+v + "-hadoop" +
       Option(System.getProperty("hadoop.version")).getOrElse("1.0.4") + ".jar" },
     mergeStrategy in assembly := {
-      case PathList("org", "datanucleus", xs @ _*)             => MergeStrategy.discard
-      case m if m.toLowerCase.endsWith("manifest.mf")          => MergeStrategy.discard
-      case m if m.toLowerCase.matches("meta-inf.*\\.sf$")      => MergeStrategy.discard
-      case "log4j.properties"                                  => MergeStrategy.discard
-      case m if m.toLowerCase.startsWith("meta-inf/services/") => MergeStrategy.filterDistinctLines
-      case "reference.conf"                                    => MergeStrategy.concat
-      case _                                                   => MergeStrategy.first
+      case PathList("org", "datanucleus", xs @ _*)               => MergeStrategy.discard
+      case PathList("org", "apache", "hive", "beeline", xs @ _*) => MergeStrategy.discard
+      case m if m.toLowerCase.endsWith("manifest.mf")            => MergeStrategy.discard
+      case m if m.toLowerCase.matches("meta-inf.*\\.sf$")        => MergeStrategy.discard
+      case "log4j.properties"                                    => MergeStrategy.discard
+      case m if m.toLowerCase.startsWith("meta-inf/services/")   => MergeStrategy.filterDistinctLines
+      case "reference.conf"                                      => MergeStrategy.concat
+      case _                                                     => MergeStrategy.first
     }
   )