Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Don't build streaming as a dependent

  • Loading branch information...
commit 1100505c712a48c77f31f7ece8c5d4f9f364b64e 1 parent 0eb7b95
Brendan W. McAdams bwmcadams authored
7 project/MongoHadoopBuild.scala
View
@@ -7,7 +7,7 @@ import AssemblyKeys._
object MongoHadoopBuild extends Build {
lazy val buildSettings = Seq(
- version := "1.0.0-rc0",
+ version := "1.0.0-rc1-SNAPSHOT",
crossScalaVersions := Nil,
crossPaths := false,
organization := "org.mongodb"
@@ -41,7 +41,7 @@ object MongoHadoopBuild extends Build {
lazy val root = Project( id = "mongo-hadoop",
base = file("."),
- settings = dependentSettings ) aggregate(core, streaming, flume, pig)
+ settings = dependentSettings ) aggregate(core, flume, pig)
lazy val core = Project( id = "mongo-hadoop-core",
base = file("core"),
@@ -112,7 +112,8 @@ object MongoHadoopBuild extends Build {
mainClass in assembly := Some("com.mongodb.hadoop.streaming.MongoStreamJob"),
excludedJars in assembly <<= (fullClasspath in assembly) map ( cp =>
cp filterNot { x =>
- x.data.getName.startsWith("hadoop-streaming") || x.data.getName.startsWith("mongo-java-driver")
+ x.data.getName.startsWith("hadoop-streaming") || x.data.getName.startsWith("mongo-java-driver") /*||
+ x.data.getName.startsWith("mongo-hadoop-core") */
}
),
libraryDependencies <++= (scalaVersion, libraryDependencies, hadoopRelease) { (sv, deps, hr: String) =>
2  streaming/build.sh
View
@@ -3,4 +3,4 @@
cd ..
./sbt mongo-hadoop-streaming/assembly
cd -
-cp target/mongo-hadoop-streaming-assembly*.jar mongo-hadoop-streaming.jar
+cp target/mongo-hadoop-streaming-assembly-1.0.0-rc1-SNAPSHOT.jar mongo-hadoop-streaming.jar
2  streaming/src/main/java/org/apache/hadoop/streaming/StreamJobPatch.java
View
@@ -48,7 +48,7 @@ protected void parseOpts() {
try{
cmdLine = _parser.parse(_options, argv_, false);
} catch(Exception oe) {
- LOG.error(oe.getMessage());
+ LOG.error("*** " + oe.getMessage());
exitUsage(argv_.length > 0 && "-info".equals(argv_[0]));
}
if (cmdLine != null){
Please sign in to comment.
Something went wrong with that request. Please try again.