Repository: spark Updated Branches: refs/heads/branch-1.0 2f091d5ef -> 4505bc28e
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 <[email protected]> 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 (cherry picked from commit f5041579ff573f988b673c2506fa4edc32f5ad84) Signed-off-by: Patrick Wendell <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/4505bc28 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/4505bc28 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/4505bc28 Branch: refs/heads/branch-1.0 Commit: 4505bc28e917d9ba83d231e66478bf0dbf64542e Parents: 2f091d5 Author: Sean Owen <[email protected]> Authored: Sun May 4 17:43:28 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Sun May 4 17:43:49 2014 -0700 ---------------------------------------------------------------------- core/pom.xml | 4 ++++ core/src/main/scala/org/apache/spark/util/Utils.scala | 5 ++--- pom.xml | 5 +++++ project/SparkBuild.scala | 1 + 4 files changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/4505bc28/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index a32aee9..800e709 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -70,6 +70,10 @@ <artifactId>guava</artifactId> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/spark/blob/4505bc28/core/src/main/scala/org/apache/spark/util/Utils.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/util/Utils.scala b/core/src/main/scala/org/apache/spark/util/Utils.scala index acd7eef..bef4dab 100644 --- a/core/src/main/scala/org/apache/spark/util/Utils.scala +++ b/core/src/main/scala/org/apache/spark/util/Utils.scala @@ -32,6 +32,7 @@ import scala.util.Try import com.google.common.io.Files import com.google.common.util.concurrent.ThreadFactoryBuilder +import org.apache.commons.lang3.SystemUtils import org.apache.hadoop.fs.{FileSystem, FileUtil, Path} import org.json4s._ import tachyon.client.{TachyonFile,TachyonFS} @@ -1073,9 +1074,7 @@ private[spark] object Utils extends Logging { /** * Return true if this is Windows. */ - def isWindows = { - Option(System.getProperty("os.name")).exists(_.startsWith("Windows")) - } + def isWindows = SystemUtils.IS_OS_WINDOWS /** * Indicates whether Spark is currently running unit tests. http://git-wip-us.apache.org/repos/asf/spark/blob/4505bc28/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2a4d595..41b98ed 100644 --- a/pom.xml +++ b/pom.xml @@ -222,6 +222,11 @@ <version>14.0.1</version> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.3.2</version> + </dependency> + <dependency> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> <version>1.3.9</version> http://git-wip-us.apache.org/repos/asf/spark/blob/4505bc28/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index ea91ec7..2d83b90 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -326,6 +326,7 @@ object SparkBuild extends Build { name := "spark-core", libraryDependencies ++= Seq( "com.google.guava" % "guava" % "14.0.1", + "org.apache.commons" % "commons-lang3" % "3.3.2", "com.google.code.findbugs" % "jsr305" % "1.3.9", "log4j" % "log4j" % "1.2.17", "org.slf4j" % "slf4j-api" % slf4jVersion,
