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/12 06:51:55 UTC
zeppelin git commit: ZEPPELIN-3222. Shade libfb303 in SparkInterpreter
Repository: zeppelin
Updated Branches:
refs/heads/master aa13a0a57 -> c6afe8c63
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 <zj...@apache.org>
Closes #2790 from zjffdu/ZEPPELIN-3222 and squashes the following commits:
8e8528d [Jeff Zhang] ZEPPELIN-3222. Shade libfb303 in SparkInterpreter
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c6afe8c6
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c6afe8c6
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c6afe8c6
Branch: refs/heads/master
Commit: c6afe8c632295d3eab23745ddce59bb4286b4202
Parents: aa13a0a
Author: Jeff Zhang <zj...@apache.org>
Authored: Mon Feb 12 14:10:25 2018 +0800
Committer: Jeff Zhang <zj...@apache.org>
Committed: Mon Feb 12 14:51:48 2018 +0800
----------------------------------------------------------------------
spark/interpreter/pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c6afe8c6/spark/interpreter/pom.xml
----------------------------------------------------------------------
diff --git a/spark/interpreter/pom.xml b/spark/interpreter/pom.xml
index 758f697..e8d57a2 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>