diff --git a/core/pom.xml b/core/pom.xml index 822b5b1dd7cc28b6678736efc7426a7df085cc4e..36c71e67b56aa7a5e656830fb44442f954afa3fc 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -69,6 +69,10 @@ <groupId>com.google.guava</groupId> <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> 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 acd7eef6d25ea0c57e86aa92984645196c3e5173..bef4dab3d7cc1f1fd3fe30e5ea87b72a4f426a5d 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. diff --git a/pom.xml b/pom.xml index ebd359a9de17f31117b6d6e9f68767d28458e955..7678043484a4c78b78b3928420549eeb6388b521 100644 --- a/pom.xml +++ b/pom.xml @@ -221,6 +221,11 @@ <artifactId>guava</artifactId> <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> diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 51f73351111668b0be112865f92ee563d28018c2..19aa3c0607a2105ca77e8dc77d5015d8c6eb0fdc 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,