diff options
| author | Raymond Liu <raymond.liu@intel.com> | 2013-11-14 12:44:19 +0800 |
|---|---|---|
| committer | Raymond Liu <raymond.liu@intel.com> | 2013-11-14 12:44:19 +0800 |
| commit | a60620b76a98e236f1e4ffda7a2f289e7917b957 (patch) | |
| tree | f66630007c201074af74ba13dca24ab9894ae543 /project/SparkBuild.scala | |
| parent | 0f2e3c6e31d56c627ff81cdc93289a7c7cb2ec16 (diff) | |
| parent | 2054c61a18c277c00661b89bbae365470c297031 (diff) | |
| download | spark-a60620b76a98e236f1e4ffda7a2f289e7917b957.tar.gz spark-a60620b76a98e236f1e4ffda7a2f289e7917b957.tar.bz2 spark-a60620b76a98e236f1e4ffda7a2f289e7917b957.zip | |
Merge branch 'master' into scala-2.10
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index b71e1b3a56..9a3cbbe7d2 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -172,6 +172,7 @@ object SparkBuild extends Build { "org.scalacheck" %% "scalacheck" % "1.10.0" % "test", "com.novocode" % "junit-interface" % "0.9" % "test", "org.easymock" % "easymock" % "3.1" % "test", + "org.mockito" % "mockito-all" % "1.8.5" % "test", "commons-io" % "commons-io" % "2.4" % "test" ), @@ -268,7 +269,7 @@ object SparkBuild extends Build { def toolsSettings = sharedSettings ++ Seq( name := "spark-tools" - ) + ) ++ assemblySettings ++ extraAssemblySettings def bagelSettings = sharedSettings ++ Seq( name := "spark-bagel" @@ -333,7 +334,7 @@ object SparkBuild extends Build { case m if m.toLowerCase.endsWith("manifest.mf") => MergeStrategy.discard case m if m.toLowerCase.matches("meta-inf.*\\.sf$") => MergeStrategy.discard case "log4j.properties" => MergeStrategy.discard - case "META-INF/services/org.apache.hadoop.fs.FileSystem" => MergeStrategy.concat + case m if m.toLowerCase.startsWith("meta-inf/services/") => MergeStrategy.filterDistinctLines case "reference.conf" => MergeStrategy.concat case _ => MergeStrategy.first } |