Github user pwendell commented on a diff in the pull request:
https://github.com/apache/spark/pull/772#discussion_r13017098
--- Diff: project/SparkBuild.scala ---
@@ -21,161 +21,52 @@ import sbt.Keys._
import sbtassembly.Plugin._
import AssemblyKeys._
import scala.util.Properties
+import scala.collection.JavaConversions._
import org.scalastyle.sbt.ScalastylePlugin.{Settings => ScalaStyleSettings}
import com.typesafe.tools.mima.plugin.MimaKeys.previousArtifact
+import com.typesafe.sbt.pom.{PomBuild, SbtPomKeys}
+import net.virtualvoid.sbt.graph.Plugin.graphSettings
import sbtunidoc.Plugin._
import UnidocKeys._
import scala.collection.JavaConversions._
-// For Sonatype publishing
-// import com.jsuereth.pgp.sbtplugin.PgpKeys._
-
-object SparkBuild extends Build {
- val SPARK_VERSION = "1.0.0-SNAPSHOT"
- val SPARK_VERSION_SHORT = SPARK_VERSION.replaceAll("-SNAPSHOT", "")
-
- // Hadoop version to build against. For example, "1.0.4" for Apache
releases, or
- // "2.0.0-mr1-cdh4.2.0" for Cloudera Hadoop. Note that these variables
can be set
- // through the environment variables SPARK_HADOOP_VERSION and SPARK_YARN.
- val DEFAULT_HADOOP_VERSION = "1.0.4"
-
- // Whether the Hadoop version to build against is 2.2.x, or a variant of
it. This can be set
- // through the SPARK_IS_NEW_HADOOP environment variable.
- val DEFAULT_IS_NEW_HADOOP = false
-
- val DEFAULT_YARN = false
-
- val DEFAULT_HIVE = false
-
- // HBase version; set as appropriate.
- val HBASE_VERSION = "0.94.6"
-
- // Target JVM version
- val SCALAC_JVM_VERSION = "jvm-1.6"
- val JAVAC_JVM_VERSION = "1.6"
-
- lazy val root = Project("root", file("."), settings = rootSettings)
aggregate(allProjects: _*)
-
- lazy val core = Project("core", file("core"), settings = coreSettings)
-
- lazy val repl = Project("repl", file("repl"), settings = replSettings)
- .dependsOn(core, graphx, bagel, mllib, sql)
-
- lazy val tools = Project("tools", file("tools"), settings =
toolsSettings) dependsOn(core) dependsOn(streaming)
-
- lazy val bagel = Project("bagel", file("bagel"), settings =
bagelSettings) dependsOn(core)
-
- lazy val graphx = Project("graphx", file("graphx"), settings =
graphxSettings) dependsOn(core)
-
- lazy val catalyst = Project("catalyst", file("sql/catalyst"), settings =
catalystSettings) dependsOn(core)
-
- lazy val sql = Project("sql", file("sql/core"), settings =
sqlCoreSettings) dependsOn(core, catalyst)
+object SparkBuild extends PomBuild {
- lazy val hive = Project("hive", file("sql/hive"), settings =
hiveSettings) dependsOn(sql)
+ val sparkVersion = "1.0.0-SNAPSHOT"
- lazy val maybeHive: Seq[ClasspathDependency] = if (isHiveEnabled)
Seq(hive) else Seq()
- lazy val maybeHiveRef: Seq[ProjectReference] = if (isHiveEnabled)
Seq(hive) else Seq()
+ val buildLocation = (file(".").getAbsoluteFile.getParentFile)
--- End diff --
Are the outer parentheses needed here?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
