You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by zj...@apache.org on 2018/06/07 06:38:30 UTC
zeppelin git commit: [HOTFIX] ZEPPELIN-2221's dependency issue
Repository: zeppelin
Updated Branches:
refs/heads/master c972e257f -> 48647e597
[HOTFIX] ZEPPELIN-2221's dependency issue
### What is this PR for?
Fixing some CI by changing `hadoop-client` version of ₩spark_core` and `guava` version of `zeppelin-python`. We basically remove `zeppelin-python` dependency from `zeppelin-spark` interpreter in a near future.
### What type of PR is it?
[Hot Fix]
### Todos
* [x] - Fix dependency problem between hadoop-client and guava
### What is the Jira issue?
N/A
### How should this be tested?
* It should pass CI
### 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 <jo...@gmail.com>
Closes #3010 from jongyoul/hotfix/zeppelin-2221-dependency-issue and squashes the following commits:
d1b89dd5e [Jongyoul Lee] Change hadoop-client version to avoid guava conflict
16fa70e40 [Jongyoul Lee] Exclude guava from zeppelin-python dependency from spark/interpreter
ede117b22 [Jongyoul Lee] Add a guava version of `19.0` to avoid guava version mismatch
b0873e369 [Jongyoul Lee] Change the version of the dependency of `hadoop-common` to `2.6.5`
542b18820 [Jongyoul Lee] Revert a scope of hadoop-comoon to `provided`
8bc67e6c5 [Jongyoul Lee] Add a dependency of `hadoop-common` as `test` scope
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/48647e59
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/48647e59
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/48647e59
Branch: refs/heads/master
Commit: 48647e5977fcd5ae8aaa5e3f750ddfe9934761b5
Parents: c972e25
Author: Jongyoul Lee <jo...@gmail.com>
Authored: Thu Jun 7 12:51:33 2018 +0900
Committer: Jeff Zhang <zj...@apache.org>
Committed: Thu Jun 7 14:38:25 2018 +0800
----------------------------------------------------------------------
spark/interpreter/pom.xml | 12 ++++++++++++
spark/spark-shims/pom.xml | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/48647e59/spark/interpreter/pom.xml
----------------------------------------------------------------------
diff --git a/spark/interpreter/pom.xml b/spark/interpreter/pom.xml
index 5330b1c..f20298e 100644
--- a/spark/interpreter/pom.xml
+++ b/spark/interpreter/pom.xml
@@ -131,6 +131,18 @@
<artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <version>2.6.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/48647e59/spark/spark-shims/pom.xml
----------------------------------------------------------------------
diff --git a/spark/spark-shims/pom.xml b/spark/spark-shims/pom.xml
index 4e70a4e..070b941 100644
--- a/spark/spark-shims/pom.xml
+++ b/spark/spark-shims/pom.xml
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>2.2.0</version>
+ <version>2.6.0</version>
<scope>provided</scope>
</dependency>
</dependencies>