Skip to content
Snippets Groups Projects
Commit ce6b5a3e authored by Matei Zaharia's avatar Matei Zaharia
Browse files

Uncomment Maven publishing stuff and set version to 0.6.0

parent 8815aeba
No related branches found
No related tags found
No related merge requests found
...@@ -4,13 +4,13 @@ import Keys._ ...@@ -4,13 +4,13 @@ import Keys._
import sbtassembly.Plugin._ import sbtassembly.Plugin._
import AssemblyKeys._ import AssemblyKeys._
import twirl.sbt.TwirlPlugin._ import twirl.sbt.TwirlPlugin._
// For Sonatype publishing // For Sonatype publishing
// import com.jsuereth.pgp.sbtplugin.PgpKeys._ import com.jsuereth.pgp.sbtplugin.PgpKeys._
object SparkBuild extends Build { object SparkBuild extends Build {
// Hadoop version to build against. For example, "0.20.2", "0.20.205.0", or // Hadoop version to build against. For example, "0.20.2", "0.20.205.0", or
// "1.0.1" for Apache releases, or "0.20.2-cdh3u3" for Cloudera Hadoop. // "1.0.3" for Apache releases, or "0.20.2-cdh3u5" for Cloudera Hadoop.
val HADOOP_VERSION = "0.20.205.0" val HADOOP_VERSION = "1.0.3"
lazy val root = Project("root", file("."), settings = rootSettings) aggregate(core, repl, examples, bagel) lazy val root = Project("root", file("."), settings = rootSettings) aggregate(core, repl, examples, bagel)
...@@ -28,7 +28,7 @@ object SparkBuild extends Build { ...@@ -28,7 +28,7 @@ object SparkBuild extends Build {
def sharedSettings = Defaults.defaultSettings ++ Seq( def sharedSettings = Defaults.defaultSettings ++ Seq(
organization := "org.spark-project", organization := "org.spark-project",
version := "0.6.0-SNAPSHOT", version := "0.6.0",
scalaVersion := "2.9.2", scalaVersion := "2.9.2",
scalacOptions := Seq(/*"-deprecation",*/ "-unchecked", "-optimize"), // -deprecation is too noisy due to usage of old Hadoop API, enable it once that's no longer an issue scalacOptions := Seq(/*"-deprecation",*/ "-unchecked", "-optimize"), // -deprecation is too noisy due to usage of old Hadoop API, enable it once that's no longer an issue
unmanagedJars in Compile <<= baseDirectory map { base => (base / "lib" ** "*.jar").classpath }, unmanagedJars in Compile <<= baseDirectory map { base => (base / "lib" ** "*.jar").classpath },
...@@ -36,7 +36,7 @@ object SparkBuild extends Build { ...@@ -36,7 +36,7 @@ object SparkBuild extends Build {
transitiveClassifiers in Scope.GlobalScope := Seq("sources"), transitiveClassifiers in Scope.GlobalScope := Seq("sources"),
testListeners <<= target.map(t => Seq(new eu.henkelmann.sbt.JUnitXmlTestsListener(t.getAbsolutePath))), testListeners <<= target.map(t => Seq(new eu.henkelmann.sbt.JUnitXmlTestsListener(t.getAbsolutePath))),
/* For Sonatype publishing // For Sonatype publishing
resolvers ++= Seq("sonatype-snapshots" at "https://oss.sonatype.org/content/repositories/snapshots", resolvers ++= Seq("sonatype-snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
"sonatype-staging" at "https://oss.sonatype.org/service/local/staging/deploy/maven2/"), "sonatype-staging" at "https://oss.sonatype.org/service/local/staging/deploy/maven2/"),
...@@ -68,17 +68,16 @@ object SparkBuild extends Build { ...@@ -68,17 +68,16 @@ object SparkBuild extends Build {
</developer> </developer>
</developers> </developers>
), ),
publishTo <<= version { (v: String) => publishTo <<= version { (v: String) =>
val nexus = "https://oss.sonatype.org/" val nexus = "https://oss.sonatype.org/"
if (v.trim.endsWith("SNAPSHOT")) if (v.trim.endsWith("SNAPSHOT"))
Some("sonatype-snapshots" at nexus + "content/repositories/snapshots") Some("sonatype-snapshots" at nexus + "content/repositories/snapshots")
else else
Some("sonatype-staging" at nexus + "service/local/staging/deploy/maven2") Some("sonatype-staging" at nexus + "service/local/staging/deploy/maven2")
}, },
credentials += Credentials(Path.userHome / ".sbt" / "sonatype.credentials"), credentials += Credentials(Path.userHome / ".sbt" / "sonatype.credentials"),
*/
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"org.eclipse.jetty" % "jetty-server" % "7.5.3.v20111011", "org.eclipse.jetty" % "jetty-server" % "7.5.3.v20111011",
......
...@@ -13,5 +13,6 @@ addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.0.0") ...@@ -13,5 +13,6 @@ addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.0.0")
addSbtPlugin("cc.spray" %% "sbt-twirl" % "0.5.2") addSbtPlugin("cc.spray" %% "sbt-twirl" % "0.5.2")
// For Sonatype publishing // For Sonatype publishing
// resolvers += Resolver.url("sbt-plugin-releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases/"))(Resolver.ivyStylePatterns) resolvers += Resolver.url("sbt-plugin-releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases/"))(Resolver.ivyStylePatterns)
// addSbtPlugin("com.jsuereth" % "xsbt-gpg-plugin" % "0.6")
addSbtPlugin("com.jsuereth" % "xsbt-gpg-plugin" % "0.6")
...@@ -200,7 +200,7 @@ class SparkILoop(in0: Option[BufferedReader], val out: PrintWriter, val master: ...@@ -200,7 +200,7 @@ class SparkILoop(in0: Option[BufferedReader], val out: PrintWriter, val master:
____ __ ____ __
/ __/__ ___ _____/ /__ / __/__ ___ _____/ /__
_\ \/ _ \/ _ `/ __/ '_/ _\ \/ _ \/ _ `/ __/ '_/
/___/ .__/\_,_/_/ /_/\_\ version 0.6.0-SNAPSHOT /___/ .__/\_,_/_/ /_/\_\ version 0.6.0
/_/ /_/
""") """)
import Properties._ import Properties._
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment