Repository: zeppelin Updated Branches: refs/heads/master 67cb82895 -> 9d4550a53
[HOTFIX][ZEPPELIN-1169] Fix wrong Guava version ### What is this PR for? Fixing the incompatible version for guava ### What type of PR is it? [Hot Fix] ### Todos * [x] - Revert guava.version for fitting in hadoop-2.6 ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1169 ### How should this be tested? 1. `mvn clean package -Pspark-1.6 -Phadoop-2.4 -Pyarn -Ppyspark -DskipTests` 1. Run spark interpreter with simple script ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jongyoul Lee <[email protected]> Closes #1199 from jongyoul/ZEPPELIN-1169 and squashes the following commits: e0b11c1 [Jongyoul Lee] Reverted guava.version for fitting in hadoop-2.6 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/9d4550a5 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/9d4550a5 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/9d4550a5 Branch: refs/heads/master Commit: 9d4550a53d2fed45d46ba1d3708d1fae1680ffe1 Parents: 67cb828 Author: Jongyoul Lee <[email protected]> Authored: Mon Jul 18 13:38:13 2016 +0900 Committer: Jongyoul Lee <[email protected]> Committed: Wed Jul 20 14:01:52 2016 +0900 ---------------------------------------------------------------------- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9d4550a5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2058cfa..918f97c 100755 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ <log4j.version>1.2.17</log4j.version> <libthrift.version>0.9.2</libthrift.version> <gson.version>2.2</gson.version> - <guava.version>19.0</guava.version> + <guava.version>15.0</guava.version> <jetty.version>9.2.15.v20160210</jetty.version> <PermGen>64m</PermGen>
