diff options
author | Claes Redestad <claes.redestad@gmail.com> | 2016-02-14 11:49:37 +0000 |
---|---|---|
committer | Sean Owen <sowen@cloudera.com> | 2016-02-14 11:49:37 +0000 |
commit | 22e9723d6208f2cd2dfa26487ea1c041cb9d7dcd (patch) | |
tree | b610c1175d9725f8b88208c0e79126a98d566bd7 /project/SparkBuild.scala | |
parent | 331293c30242dc43e54a25171ca51a1c9330ae44 (diff) | |
download | spark-22e9723d6208f2cd2dfa26487ea1c041cb9d7dcd.tar.gz spark-22e9723d6208f2cd2dfa26487ea1c041cb9d7dcd.tar.bz2 spark-22e9723d6208f2cd2dfa26487ea1c041cb9d7dcd.zip |
[SPARK-13278][CORE] Launcher fails to start with JDK 9 EA
See http://openjdk.java.net/jeps/223 for more information about the JDK 9 version string scheme.
Author: Claes Redestad <claes.redestad@gmail.com>
Closes #11160 from cl4es/master.
Diffstat (limited to 'project/SparkBuild.scala')
-rw-r--r-- | project/SparkBuild.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 6eba58c87c..646efb4d09 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -167,8 +167,10 @@ object SparkBuild extends PomBuild { publishLocalBoth <<= Seq(publishLocal in MavenCompile, publishLocal).dependOn, javacOptions in (Compile, doc) ++= { - val Array(major, minor, _) = System.getProperty("java.version").split("\\.", 3) - if (major.toInt >= 1 && minor.toInt >= 8) Seq("-Xdoclint:all", "-Xdoclint:-missing") else Seq.empty + val versionParts = System.getProperty("java.version").split("[+.\\-]+", 3) + var major = versionParts(0).toInt + if (major == 1) major = versionParts(1).toInt + if (major >= 8) Seq("-Xdoclint:all", "-Xdoclint:-missing") else Seq.empty }, javacJVMVersion := "1.7", |