Permalink
Browse files

More cleanup for pull request

  • Loading branch information...
1 parent 260e4e7 commit 2b1d9b3dcc1f4b0b145783cc0183e7936a83682a @thmsmlr thmsmlr committed Jun 25, 2012
Showing with 8 additions and 12 deletions.
  1. +0 −1 build.sbt
  2. +8 −11 project/MongoHadoopBuild.scala
View
@@ -1,4 +1,3 @@
-javacOptions += "-g"
name := "mongo-hadoop"
@@ -7,13 +7,11 @@ import AssemblyKeys._
object MongoHadoopBuild extends Build {
-
lazy val buildSettings = Seq(
version := "1.1.0-SNAPSHOT",
crossScalaVersions := Nil,
crossPaths := false,
organization := "org.mongodb"
-
)
/** The version of Hadoop to build against. */
@@ -30,7 +28,7 @@ object MongoHadoopBuild extends Build {
private val cdh4CoreHadoop = "0.23.0-mr1-%s".format(cdh4Rel)
private val cdh4Pig = "0.9.2-%s".format(cdh4Rel)
- private val coreHadoopMap = Map("0.20" -> hadoopDependencies("0.20.2-hawk", false, "0.9.0-mortar"),
+ private val coreHadoopMap = Map("0.20" -> hadoopDependencies("0.20.205.0", false, stockPig),
"0.20.x" -> hadoopDependencies("0.20.205.0", false, stockPig),
"0.21" -> hadoopDependencies("0.21.0", true, stockPig),
"0.21.x" -> hadoopDependencies("0.21.0", true, stockPig),
@@ -279,20 +277,20 @@ object MongoHadoopBuild extends Build {
println("*** Adding Hadoop Dependencies for Hadoop '%s'".format(altStreamingVer.getOrElse(hadoopVersion)))
val deps = if (altStreamingVer.isDefined || nextGen)
- Seq(/**"org.apache.hadoop" % "hadoop-common" % altStreamingVer.getOrElse(hadoopVersion)*/)
+ Seq("org.apache.hadoop" % "hadoop-common" % altStreamingVer.getOrElse(hadoopVersion))
else
- Seq(/**"org.apache.hadoop" % "hadoop-core" % hadoopVersion,
+ Seq("org.apache.hadoop" % "hadoop-core" % hadoopVersion/*,
("org.apache.hadoop" % "hadoop-hdfs" % hadoopVersion notTransitive()).exclude("commons-daemon", "commons-daemon")*/)
if (nextGen) {
def mrDep(mod: String) = "org.apache.hadoop" % "hadoop-mapreduce-client-%s".format(mod) % altStreamingVer.getOrElse(hadoopVersion) notTransitive() exclude("org.apache.hadoop", "hdfs")
if (hadoopVersion.startsWith("0.22")) {
- deps ++ Seq(/**"org.apache.hadoop" % "hadoop-mapred" % altStreamingVer.getOrElse(hadoopVersion)*/)
+ deps ++ Seq("org.apache.hadoop" % "hadoop-mapred" % altStreamingVer.getOrElse(hadoopVersion))
} else if (hadoopVersion.startsWith("0.23")) {
- deps ++ Seq(/**mrDep("core"), mrDep("common"), mrDep("shuffle"),
- mrDep("shuffle"), mrDep("app"), mrDep("jobclient")*/)
+ deps ++ Seq(mrDep("core"), mrDep("common"), mrDep("shuffle"),
+ mrDep("shuffle"), mrDep("app"), mrDep("jobclient"))
} else {
sys.error("Don't know how to do any special mapping for Hadoop Version " + hadoopVersion)
}
@@ -309,7 +307,7 @@ object MongoHadoopBuild extends Build {
println("*** Adding Pig Dependency for Version '%s'".format(pigVersion))
Seq(
- /**"org.apache.pig" % "pig" % pigVersion */
+ "org.apache.pig" % "pig" % pigVersion
)
}
}
@@ -347,5 +345,4 @@ object Dependencies {
val scoobi = "com.nicta" %% "scoobi" % "0.4.0" % "provided"
}
-
-// vim: set ts=2 sw=2 sts=2 et:
+// vim: set ts=2 sw=2 sts=2 et:

0 comments on commit 2b1d9b3

Please sign in to comment.