zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zjf...@apache.org
Subject zeppelin git commit: ZEPPELIN-3222. Shade libfb303 in SparkInterpreter
Date Mon, 12 Feb 2018 06:52:11 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/branch-0.8 504dd4782 -> 80efe9a4c


ZEPPELIN-3222. Shade libfb303 in SparkInterpreter

### What is this PR for?
Trivial change for shading libfb303, otherwise it would conflict with libfb303 of CDH.

### What type of PR is it?
[Improvement]

### Todos
* [ ] - Task

### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-3222

### How should this be tested?
* CI pass

### 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: Jeff Zhang <zjffdu@apache.org>

Closes #2790 from zjffdu/ZEPPELIN-3222 and squashes the following commits:

8e8528d [Jeff Zhang] ZEPPELIN-3222. Shade libfb303 in SparkInterpreter

(cherry picked from commit c6afe8c632295d3eab23745ddce59bb4286b4202)
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/80efe9a4
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/80efe9a4
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/80efe9a4

Branch: refs/heads/branch-0.8
Commit: 80efe9a4c0b2c3488f55f03e093b80d480379756
Parents: 504dd47
Author: Jeff Zhang <zjffdu@apache.org>
Authored: Mon Feb 12 14:10:25 2018 +0800
Committer: Jeff Zhang <zjffdu@apache.org>
Committed: Mon Feb 12 14:52:04 2018 +0800

----------------------------------------------------------------------
 spark/interpreter/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/80efe9a4/spark/interpreter/pom.xml
----------------------------------------------------------------------
diff --git a/spark/interpreter/pom.xml b/spark/interpreter/pom.xml
index 0f3f163..5e24933 100644
--- a/spark/interpreter/pom.xml
+++ b/spark/interpreter/pom.xml
@@ -478,6 +478,10 @@
               <pattern>py4j.</pattern>
               <shadedPattern>org.apache.zeppelin.py4j.</shadedPattern>
             </relocation>
+            <relocation>
+              <pattern>com.facebook.fb303</pattern>
+              <shadedPattern>org.apache.zeppelin.com.facebook.fb303</shadedPattern>
+            </relocation>
           </relocations>
         </configuration>
         <executions>


Mime
View raw message