This is an automated email from the ASF dual-hosted git repository.
zjffdu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push:
new 974f986 [ZEPPELIN-4532]. Add a shaded version of
zeppelin-jupyter-interpreter
974f986 is described below
commit 974f98606886d2b5dc6e7f702120b2ce4004af77
Author: Jeff Zhang <zjf...@apache.org>
AuthorDate: Thu Jan 2 22:01:42 2020 +0800
[ZEPPELIN-4532]. Add a shaded version of zeppelin-jupyter-interpreter
### What is this PR for?
This PR add a new module `zeppelin-jupyter-interpreter-shaded` which shaded
the guava so that other module (python and r ) won't be bothered by the problem
of guava conflict.
### What type of PR is it?
[Improvement ]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://jira.apache.org/jira/browse/ZEPPELIN-4532
### 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 <zjf...@apache.org>
Closes #3585 from zjffdu/ZEPPELIN-4532 and squashes the following commits:
12afc937b [Jeff Zhang] [ZEPPELIN-4532]. Add a shaded version of
zeppelin-jupyter-interpreter
---
pom.xml | 1 +
python/pom.xml | 18 +----
rlang/pom.xml | 22 +-----
zeppelin-jupyter-interpreter-shaded/pom.xml | 100 ++++++++++++++++++++++++++++
4 files changed, 104 insertions(+), 37 deletions(-)
diff --git a/pom.xml b/pom.xml
index 96a2912..bdcebe0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,7 @@
<module>zeppelin-display</module>
<module>rlang</module>
<module>zeppelin-jupyter-interpreter</module>
+ <module>zeppelin-jupyter-interpreter-shaded</module>
<module>kotlin</module>
<module>groovy</module>
<module>spark</module>
diff --git a/python/pom.xml b/python/pom.xml
index 76fc0d5..cea34cc 100644
--- a/python/pom.xml
+++ b/python/pom.xml
@@ -43,7 +43,7 @@
<dependencies>
<dependency>
<groupId>org.apache.zeppelin</groupId>
- <artifactId>zeppelin-jupyter-interpreter</artifactId>
+ <artifactId>zeppelin-jupyter-interpreter-shaded</artifactId>
<version>${project.version}</version>
</dependency>
@@ -60,22 +60,6 @@
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-netty</artifactId>
- <version>${grpc.version}</version>
- </dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-protobuf</artifactId>
- <version>${grpc.version}</version>
- </dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-stub</artifactId>
- <version>${grpc.version}</version>
- </dependency>
-
- <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
diff --git a/rlang/pom.xml b/rlang/pom.xml
index 6284fcb..5a7de91 100644
--- a/rlang/pom.xml
+++ b/rlang/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.zeppelin</groupId>
- <artifactId>zeppelin-jupyter-interpreter</artifactId>
+ <artifactId>zeppelin-jupyter-interpreter-shaded</artifactId>
<version>${project.version}</version>
</dependency>
@@ -65,25 +65,7 @@
<classifier>tests</classifier>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-netty</artifactId>
- <version>${grpc.version}</version>
- </dependency>
-
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-protobuf</artifactId>
- <version>${grpc.version}</version>
- </dependency>
-
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-stub</artifactId>
- <version>${grpc.version}</version>
- </dependency>
-
+
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
diff --git a/zeppelin-jupyter-interpreter-shaded/pom.xml
b/zeppelin-jupyter-interpreter-shaded/pom.xml
new file mode 100644
index 0000000..d748c7d
--- /dev/null
+++ b/zeppelin-jupyter-interpreter-shaded/pom.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>zeppelin</artifactId>
+ <groupId>org.apache.zeppelin</groupId>
+ <version>0.9.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>zeppelin-jupyter-interpreter-shaded</artifactId>
+ <packaging>jar</packaging>
+ <version>0.9.0-SNAPSHOT</version>
+ <name>Zeppelin: Jupyter Interpreter Shaded</name>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>zeppelin-jupyter-interpreter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-shade-plugin</artifactId>
+ <configuration>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ </filter>
+ </filters>
+ <transformers>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
/>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>reference.conf</resource>
+ </transformer>
+ </transformers>
+ <artifactSet>
+ <excludes>
+ <exclude>org.apache.zeppelin:zeppelin-interpreter-api</exclude>
+ </excludes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>com.google</pattern>
+
<shadedPattern>org.apache.zeppelin.jupyter.com.google</shadedPattern>
+ </relocation>
+ </relocations>
+
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>
