Repository: incubator-zeppelin Updated Branches: refs/heads/master 0b47cde44 -> cd486ef3c
[ZEPPELIN-283] IllegalArgumentException when running provided Spark 1.5.0 snapshot build This relax the Spark version check to allow for "1.5.0-SNAPSHOT" Leemoonsoo Author: Felix Cheung <[email protected]> Closes #284 from felixcheung/sparksnapshotversion and squashes the following commits: 4fb6426 [Felix Cheung] [ZEPPELIN-283] IllegalArgumentException when running Zeppelin on provided Spark 1.5.0 snapshot build Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/cd486ef3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/cd486ef3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/cd486ef3 Branch: refs/heads/master Commit: cd486ef3cacd42c0e25496cc93dc10a51bb1ac28 Parents: 0b47cde Author: Felix Cheung <[email protected]> Authored: Sun Sep 6 13:01:30 2015 -0700 Committer: Lee moon soo <[email protected]> Committed: Mon Sep 7 08:12:33 2015 -0700 ---------------------------------------------------------------------- spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java | 3 ++- .../src/test/java/org/apache/zeppelin/spark/SparkVersionTest.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/cd486ef3/spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java ---------------------------------------------------------------------- diff --git a/spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java b/spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java index 0a52fe2..8fcdc1d 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java @@ -49,7 +49,8 @@ public enum SparkVersion { public static SparkVersion fromVersionString(String versionString) { for (SparkVersion v : values()) { - if (v.toString().equals(versionString)) { + // Check for the beginning of the version string to allow for "1.5.0-SNAPSHOT" + if (versionString.startsWith(v.toString())) { return v; } } http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/cd486ef3/spark/src/test/java/org/apache/zeppelin/spark/SparkVersionTest.java ---------------------------------------------------------------------- diff --git a/spark/src/test/java/org/apache/zeppelin/spark/SparkVersionTest.java b/spark/src/test/java/org/apache/zeppelin/spark/SparkVersionTest.java index dd00f73..ab54b65 100644 --- a/spark/src/test/java/org/apache/zeppelin/spark/SparkVersionTest.java +++ b/spark/src/test/java/org/apache/zeppelin/spark/SparkVersionTest.java @@ -26,6 +26,7 @@ public class SparkVersionTest { public void testSparkVersion() { // test equals assertTrue(SparkVersion.SPARK_1_2_0 == SparkVersion.fromVersionString("1.2.0")); + assertTrue(SparkVersion.SPARK_1_5_0 == SparkVersion.fromVersionString("1.5.0-SNAPSHOT")); // test newer than assertFalse(SparkVersion.SPARK_1_2_0.newerThan(SparkVersion.SPARK_1_2_0));
