Repository: zeppelin Updated Branches: refs/heads/branch-0.6 13752e202 -> b3606510f
ZEPPELIN-1227 change spark-2.0.0-preview to spark-2.0.0 Change spark-2.0.0-preview to spark-2.0.0 Improvement * [x] - Update pom.xml and .travis.yml https://issues.apache.org/jira/browse/ZEPPELIN-1227 * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Lee moon soo <[email protected]> Closes #1235 from Leemoonsoo/ZEPPELIN-1227 and squashes the following commits: f2cd91d [Lee moon soo] trigger ci fff6144 [Lee moon soo] change spark-2.0.0-preview to spark-2.0.0 (cherry picked from commit 3eea27f653c326d6511526a948e1e250bd0452f0) Signed-off-by: Lee moon soo <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/b3606510 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/b3606510 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/b3606510 Branch: refs/heads/branch-0.6 Commit: b3606510f625283147de1d946af1ae7fddd188da Parents: 13752e2 Author: Lee moon soo <[email protected]> Authored: Thu Jul 28 18:53:08 2016 +0900 Committer: Lee moon soo <[email protected]> Committed: Sat Jul 30 18:02:13 2016 +0900 ---------------------------------------------------------------------- .travis.yml | 2 +- spark/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b3606510/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 227847f..8f21c7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ matrix: include: # Test all modules with spark-2.0.0-preview and scala 2.11 - jdk: "oraclejdk7" - env: SCALA_VER="2.11" SPARK_VER="2.0.0-preview" HADOOP_VER="2.3" PROFILE="-Pspark-2.0 -Dspark.version=2.0.0-preview -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding -Pexamples -Pscala-2.11" BUILD_FLAG="package -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="" + env: SCALA_VER="2.11" SPARK_VER="2.0.0" HADOOP_VER="2.3" PROFILE="-Pspark-2.0 -Dspark.version=2.0.0-preview -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding -Pexamples -Pscala-2.11" BUILD_FLAG="package -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="" # Test all modules with scala 2.10 - jdk: "oraclejdk7" http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b3606510/spark/pom.xml ---------------------------------------------------------------------- diff --git a/spark/pom.xml b/spark/pom.xml index 24b75e5..6dd6373 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -38,7 +38,7 @@ <jsoup.version>1.8.2</jsoup.version> <mockito.version>1.10.19</mockito.version> <powermock.version>1.6.4</powermock.version> - <spark.version>1.4.1</spark.version> + <spark.version>2.0.0</spark.version> </properties> <dependencies>
