Skip to content

[SPARK-3787] Assembly jar name is wrong when we build with sbt omitting -Dhadoop.version #2647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sarutak wants to merge 7 commits into from
Closed

[SPARK-3787] Assembly jar name is wrong when we build with sbt omitting -Dhadoop.version #2647

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eebbb7d
Fixed wrong jar name
sarutak Oct 3, 2014
5fc1259
Fixed typo.
sarutak Oct 4, 2014
b2318eb
Merge branch 'master' of git://git.apache.org/spark into fix-assembly…
sarutak Oct 6, 2014
ad1f96e
Merge branch 'master' of git://git.apache.org/spark into fix-assembly…
sarutak Oct 7, 2014
c81806b
Merge branch 'master' of git://git.apache.org/spark into fix-assembly…
sarutak Oct 11, 2014
af6b100
Merge branch 'master' of git://git.apache.org/spark into fix-assembly…
sarutak Oct 31, 2014
f1c90bb
Fixed SparkBuild.scala in order to read `hadoop.version` property fro…
sarutak Nov 1, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions project/SparkBuild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
* limitations under the License.
*/

import java.io.File

import scala.util.Properties
import scala.collection.JavaConversions._

Expand All @@ -23,7 +25,7 @@ import sbt.Classpaths.publishTask
import sbt.Keys._
import sbtunidoc.Plugin.genjavadocSettings
import sbtunidoc.Plugin.UnidocKeys.unidocGenjavadocVersion
import com.typesafe.sbt.pom.{PomBuild, SbtPomKeys}
import com.typesafe.sbt.pom.{loadEffectivePom, PomBuild, SbtPomKeys}
import net.virtualvoid.sbt.graph.Plugin.graphSettings

object BuildCommons {
Expand Down Expand Up @@ -107,6 +109,15 @@ object SparkBuild extends PomBuild {

override val userPropertiesMap = System.getProperties.toMap

val pom = loadEffectivePom(new File("pom.xml"),
profiles = profiles,
userProps = userPropertiesMap)

if (System.getProperty("hadoop.version") == null) {
System.setProperty("hadoop.version",
pom.getProperties.get("hadoop.version").asInstanceOf[String])
}

lazy val MavenCompile = config("m2r") extend(Compile)
lazy val publishLocalBoth = TaskKey[Unit]("publish-local", "publish local for m2 and ivy")

Expand Down Expand Up @@ -270,7 +281,7 @@ object Assembly {
lazy val settings = assemblySettings ++ Seq(
test in assembly := {},
jarName in assembly <<= (version, moduleName) map { (v, mName) => mName + "-"+v + "-hadoop" +
Option(System.getProperty("hadoop.version")).getOrElse("1.0.4") + ".jar" },
System.getProperty("hadoop.version") + ".jar" },
mergeStrategy in assembly := {
case PathList("org", "datanucleus", xs @ _*) => MergeStrategy.discard
case m if m.toLowerCase.endsWith("manifest.mf") => MergeStrategy.discard
Expand Down