Skip to content
Snippets Groups Projects
Commit f5041579 authored by Sean Owen's avatar Sean Owen Committed by Patrick Wendell
Browse files

SPARK-1629. Addendum: Depend on commons lang3 (already used by tachyon) as...

SPARK-1629. Addendum: Depend on commons lang3 (already used by tachyon) as it's used in ReplSuite, and return to use lang3 utility in Utils.scala

For consideration. This was proposed in related discussion: https://github.com/apache/spark/pull/569

Author: Sean Owen <sowen@cloudera.com>

Closes #635 from srowen/SPARK-1629.2 and squashes the following commits:

a442b98 [Sean Owen] Depend on commons lang3 (already used by tachyon) as it's used in ReplSuite, and return to use lang3 utility in Utils.scala
parent 0c98a8f6
No related branches found
No related tags found
No related merge requests found
...@@ -69,6 +69,10 @@ ...@@ -69,6 +69,10 @@
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.google.code.findbugs</groupId> <groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId> <artifactId>jsr305</artifactId>
......
...@@ -32,6 +32,7 @@ import scala.util.Try ...@@ -32,6 +32,7 @@ import scala.util.Try
import com.google.common.io.Files import com.google.common.io.Files
import com.google.common.util.concurrent.ThreadFactoryBuilder import com.google.common.util.concurrent.ThreadFactoryBuilder
import org.apache.commons.lang3.SystemUtils
import org.apache.hadoop.fs.{FileSystem, FileUtil, Path} import org.apache.hadoop.fs.{FileSystem, FileUtil, Path}
import org.json4s._ import org.json4s._
import tachyon.client.{TachyonFile,TachyonFS} import tachyon.client.{TachyonFile,TachyonFS}
...@@ -1073,9 +1074,7 @@ private[spark] object Utils extends Logging { ...@@ -1073,9 +1074,7 @@ private[spark] object Utils extends Logging {
/** /**
* Return true if this is Windows. * Return true if this is Windows.
*/ */
def isWindows = { def isWindows = SystemUtils.IS_OS_WINDOWS
Option(System.getProperty("os.name")).exists(_.startsWith("Windows"))
}
/** /**
* Indicates whether Spark is currently running unit tests. * Indicates whether Spark is currently running unit tests.
......
...@@ -221,6 +221,11 @@ ...@@ -221,6 +221,11 @@
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>14.0.1</version> <version>14.0.1</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.3.2</version>
</dependency>
<dependency> <dependency>
<groupId>com.google.code.findbugs</groupId> <groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId> <artifactId>jsr305</artifactId>
......
...@@ -326,6 +326,7 @@ object SparkBuild extends Build { ...@@ -326,6 +326,7 @@ object SparkBuild extends Build {
name := "spark-core", name := "spark-core",
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.google.guava" % "guava" % "14.0.1", "com.google.guava" % "guava" % "14.0.1",
"org.apache.commons" % "commons-lang3" % "3.3.2",
"com.google.code.findbugs" % "jsr305" % "1.3.9", "com.google.code.findbugs" % "jsr305" % "1.3.9",
"log4j" % "log4j" % "1.2.17", "log4j" % "log4j" % "1.2.17",
"org.slf4j" % "slf4j-api" % slf4jVersion, "org.slf4j" % "slf4j-api" % slf4jVersion,
......
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