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/02/11 13:08:35 UTC
zeppelin git commit: Add exclusion to hadoop-aws dependency.
Repository: zeppelin
Updated Branches:
refs/heads/master 7fcbb9a02 -> aa13a0a57
Add exclusion to hadoop-aws dependency.
### What is this PR for?
Fix dependency error caused by different versions of same library
### What type of PR is it?
Bug Fix
### Todos
* [ ZEPPELIN-3217] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-3217
### How should this be tested?
* Travis 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: guevara <ex...@here.com>
Closes #2784 from wilsonr990/ZEPPELIN-3217 and squashes the following commits:
9f3f7e3 [guevara] Add exclusion to hadoop-aws dependency.
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/aa13a0a5
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/aa13a0a5
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/aa13a0a5
Branch: refs/heads/master
Commit: aa13a0a57c5f08c82ba90f37da6c8d7a503697f3
Parents: 7fcbb9a
Author: guevara <ex...@here.com>
Authored: Fri Feb 9 16:09:31 2018 -0500
Committer: Jeff Zhang <zj...@apache.org>
Committed: Sun Feb 11 21:08:28 2018 +0800
----------------------------------------------------------------------
zeppelin-zengine/pom.xml | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/aa13a0a5/zeppelin-zengine/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/pom.xml b/zeppelin-zengine/pom.xml
index fade4dd..a864fdf 100644
--- a/zeppelin-zengine/pom.xml
+++ b/zeppelin-zengine/pom.xml
@@ -670,6 +670,10 @@
<version>${hadoop.version}</version>
<exclusions>
<exclusion>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
@@ -790,6 +794,10 @@
<version>${hadoop.version}</version>
<exclusions>
<exclusion>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>