zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zjf...@apache.org
Subject zeppelin git commit: Add exclusion to hadoop-aws dependency.
Date Sun, 11 Feb 2018 13:08:51 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/branch-0.8 df257c5f0 -> 87c42a230


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 <ext-Wilson.Guevara@here.com>

Closes #2784 from wilsonr990/ZEPPELIN-3217 and squashes the following commits:

9f3f7e3 [guevara] Add exclusion to hadoop-aws dependency.

(cherry picked from commit aa13a0a57c5f08c82ba90f37da6c8d7a503697f3)
Signed-off-by: Jeff Zhang <zjffdu@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/87c42a23
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/87c42a23
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/87c42a23

Branch: refs/heads/branch-0.8
Commit: 87c42a230a4b9f01b94cdbe54396001b401a4710
Parents: df257c5
Author: guevara <ext-Wilson.Guevara@here.com>
Authored: Fri Feb 9 16:09:31 2018 -0500
Committer: Jeff Zhang <zjffdu@apache.org>
Committed: Sun Feb 11 21:08:45 2018 +0800

----------------------------------------------------------------------
 zeppelin-zengine/pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/87c42a23/zeppelin-zengine/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/pom.xml b/zeppelin-zengine/pom.xml
index e38a659..9ba9ac1 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>


Mime
View raw message