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 d6fa09e [ZEPPELIN-4544]. Rename zeppelin-interpreter-api to
zeppelin-interpreter-shaded
d6fa09e is described below
commit d6fa09e5b9a0f9b05bb51840b698b937c5ffa918
Author: Jeff Zhang <zjf...@apache.org>
AuthorDate: Tue Jan 7 23:46:20 2020 +0800
[ZEPPELIN-4544]. Rename zeppelin-interpreter-api to
zeppelin-interpreter-shaded
### What is this PR for?
Straightforward PR which rename zeppelin-interpreter-api to
zeppelin-interpreter-shaded
### What type of PR is it?
[Refactoring]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-4544
### 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 #3619 from zjffdu/ZEPPELIN-4544 and squashes the following commits:
380d8484f [Jeff Zhang] [ZEPPELIN-4544]. Rename zeppelin-interpreter-api to
zeppelin-interpreter-shaded
---
.travis.yml | 2 +-
beam/pom.xml | 2 +-
bin/interpreter.sh | 4 ++--
pom.xml | 2 +-
python/pom.xml | 4 ++--
spark/interpreter/pom.xml | 4 ++--
spark/spark-scala-parent/pom.xml | 2 +-
spark/spark-shims/pom.xml | 2 +-
spark/spark1-shims/pom.xml | 2 +-
spark/spark2-shims/pom.xml | 2 +-
zeppelin-interpreter-parent/pom.xml | 6 +++---
.../pom.xml | 10 +++++-----
.../zeppelin-interpreter-api}/pom.xml | 10 +++++-----
zeppelin-interpreter/pom.xml | 2 +-
zeppelin-jupyter-interpreter-shaded/pom.xml | 2 +-
.../interpreter/launcher/DockerInterpreterProcess.java | 2 +-
16 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 310e157..896b593 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -109,7 +109,7 @@ matrix:
# Test interpreter modules
- jdk: "openjdk8"
dist: xenial
- env: PYTHON="3" R="true" SCALA_VER="2.10" TENSORFLOW="1.13.1"
PROFILE="-Pscala-2.10" BUILD_FLAG="install -DskipTests -DskipRat -am"
TEST_FLAG="test -DskipRat" MODULES="-pl $(echo
.,zeppelin-interpreter,zeppelin-interpreter-api,${INTERPRETERS} | sed
's/!//g')" TEST_PROJECTS=""
+ env: PYTHON="3" R="true" SCALA_VER="2.10" TENSORFLOW="1.13.1"
PROFILE="-Pscala-2.10" BUILD_FLAG="install -DskipTests -DskipRat -am"
TEST_FLAG="test -DskipRat" MODULES="-pl $(echo
.,zeppelin-interpreter,zeppelin-interpreter-shaded,${INTERPRETERS} | sed
's/!//g')" TEST_PROJECTS=""
# Run Spark integration test and unit test separately for each spark
version
diff --git a/beam/pom.xml b/beam/pom.xml
index 7af360c..3770453 100644
--- a/beam/pom.xml
+++ b/beam/pom.xml
@@ -231,7 +231,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>zeppelin-interpreter-api</artifactId>
+ <artifactId>zeppelin-interpreter-shaded</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/bin/interpreter.sh b/bin/interpreter.sh
index 4ea8514..d79f911 100755
--- a/bin/interpreter.sh
+++ b/bin/interpreter.sh
@@ -69,7 +69,7 @@ fi
. "${bin}/common.sh"
-ZEPPELIN_INTERPRETER_API_JAR=$(find "${ZEPPELIN_HOME}/interpreter" -name
'zeppelin-interpreter-api-*.jar')
+ZEPPELIN_INTERPRETER_API_JAR=$(find "${ZEPPELIN_HOME}/interpreter" -name
'zeppelin-interpreter-shaded-*.jar')
ZEPPELIN_INTP_CLASSPATH="${CLASSPATH}:${ZEPPELIN_INTERPRETER_API_JAR}"
# construct classpath
@@ -83,7 +83,7 @@ if [[ -d
"${ZEPPELIN_HOME}/zeppelin-zengine/target/test-classes" ]]; then
addJarInDirForIntp "${ZEPPELIN_HOME}/zeppelin-zengine/target/test-classes"
fi
-addJarInDirForIntp "${ZEPPELIN_HOME}/zeppelin-interpreter-api/target"
+addJarInDirForIntp "${ZEPPELIN_HOME}/zeppelin-interpreter-shaded/target"
addJarInDirForIntp "${INTERPRETER_DIR}"
HOSTNAME=$(hostname)
diff --git a/pom.xml b/pom.xml
index 5673687..f216a55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
<modules>
<module>zeppelin-interpreter-parent</module>
<module>zeppelin-interpreter</module>
- <module>zeppelin-interpreter-api</module>
+ <module>zeppelin-interpreter-shaded</module>
<module>zeppelin-zengine</module>
<module>zeppelin-display</module>
<module>rlang</module>
diff --git a/python/pom.xml b/python/pom.xml
index cea34cc..89d76ac 100644
--- a/python/pom.xml
+++ b/python/pom.xml
@@ -142,7 +142,7 @@
<!--
shade for python interpreter is different from other interpreter, it
depends on zeppelin-interpreter instead of
- zeppelin-interpreter-api. Because spark interpreter depends on python
interpreter and spark's py4j conflict with python interpreter's py4j.
+ zeppelin-interpreter-shaded. Because spark interpreter depends on python
interpreter and spark's py4j conflict with python interpreter's py4j.
python interpreter would generate 2 versions of jars, one is shaded jar
which is used for running python interpreter, another is normal jar
which is used by spark interpreter as dependency.
-->
@@ -164,7 +164,7 @@
</transformers>
<artifactSet>
<excludes>
- <exclude>org.apache.zeppelin:zeppelin-interpreter-api</exclude>
+
<exclude>org.apache.zeppelin:zeppelin-interpreter-shaded</exclude>
</excludes>
</artifactSet>
<outputFile>${project.build.directory}/../../interpreter/python/${interpreter.jar.name}-${project.version}.jar</outputFile>
diff --git a/spark/interpreter/pom.xml b/spark/interpreter/pom.xml
index 3490d53..a3fa21a 100644
--- a/spark/interpreter/pom.xml
+++ b/spark/interpreter/pom.xml
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.apache.zeppelin</groupId>
- <artifactId>zeppelin-interpreter-api</artifactId>
+ <artifactId>zeppelin-interpreter-shaded</artifactId>
<version>${project.version}</version>
</dependency>
@@ -499,7 +499,7 @@
<exclude>org.scala-lang:scala-reflect</exclude>
<exclude>commons-lang:commons-lang</exclude>
<exclude>org.apache.commons:commons-compress</exclude>
- <exclude>org.apache.zeppelin:zeppelin-interpreter-api</exclude>
+
<exclude>org.apache.zeppelin:zeppelin-interpreter-shaded</exclude>
</excludes>
</artifactSet>
diff --git a/spark/spark-scala-parent/pom.xml b/spark/spark-scala-parent/pom.xml
index fdfd7fc..509af0b 100644
--- a/spark/spark-scala-parent/pom.xml
+++ b/spark/spark-scala-parent/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.zeppelin</groupId>
- <artifactId>zeppelin-interpreter-api</artifactId>
+ <artifactId>zeppelin-interpreter-shaded</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/spark/spark-shims/pom.xml b/spark/spark-shims/pom.xml
index 0b6261b..9568048 100644
--- a/spark/spark-shims/pom.xml
+++ b/spark/spark-shims/pom.xml
@@ -36,7 +36,7 @@
<dependencies>
<dependency>
<groupId>org.apache.zeppelin</groupId>
- <artifactId>zeppelin-interpreter-api</artifactId>
+ <artifactId>zeppelin-interpreter-shaded</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/spark/spark1-shims/pom.xml b/spark/spark1-shims/pom.xml
index e448b45..a1bb832 100644
--- a/spark/spark1-shims/pom.xml
+++ b/spark/spark1-shims/pom.xml
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.apache.zeppelin</groupId>
- <artifactId>zeppelin-interpreter-api</artifactId>
+ <artifactId>zeppelin-interpreter-shaded</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/spark/spark2-shims/pom.xml b/spark/spark2-shims/pom.xml
index 920858b..83b5153 100644
--- a/spark/spark2-shims/pom.xml
+++ b/spark/spark2-shims/pom.xml
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.zeppelin</groupId>
- <artifactId>zeppelin-interpreter-api</artifactId>
+ <artifactId>zeppelin-interpreter-shaded</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/zeppelin-interpreter-parent/pom.xml
b/zeppelin-interpreter-parent/pom.xml
index 74ba4b9..800f0fb 100644
--- a/zeppelin-interpreter-parent/pom.xml
+++ b/zeppelin-interpreter-parent/pom.xml
@@ -36,7 +36,7 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>zeppelin-interpreter-api</artifactId>
+ <artifactId>zeppelin-interpreter-shaded</artifactId>
<version>${project.version}</version>
</dependency>
@@ -112,7 +112,7 @@
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
-
<exclude>org.apache.zeppelin:zeppelin-interpreter-api</exclude>
+
<exclude>org.apache.zeppelin:zeppelin-interpreter-shaded</exclude>
</excludes>
</filter>
</filters>
@@ -124,7 +124,7 @@
</transformers>
<artifactSet>
<excludes>
- <exclude>org.apache.zeppelin:zeppelin-interpreter-api</exclude>
+
<exclude>org.apache.zeppelin:zeppelin-interpreter-shaded</exclude>
</excludes>
</artifactSet>
<outputFile>${project.basedir}/../interpreter/${interpreter.name}/${project.artifactId}-${project.version}.jar</outputFile>
diff --git a/zeppelin-interpreter-api/pom.xml
b/zeppelin-interpreter-shaded/pom.xml
similarity index 96%
copy from zeppelin-interpreter-api/pom.xml
copy to zeppelin-interpreter-shaded/pom.xml
index 280d4a6..ef136a0 100644
--- a/zeppelin-interpreter-api/pom.xml
+++ b/zeppelin-interpreter-shaded/pom.xml
@@ -29,11 +29,11 @@
</parent>
<groupId>org.apache.zeppelin</groupId>
- <artifactId>zeppelin-interpreter-api</artifactId>
+ <artifactId>zeppelin-interpreter-shaded</artifactId>
<packaging>jar</packaging>
<version>0.9.0-SNAPSHOT</version>
- <name>Zeppelin: Interpreter API</name>
- <description>Zeppelin Interpreter API</description>
+ <name>Zeppelin: Interpreter Shaded</name>
+ <description>Zeppelin Interpreter Shaded</description>
<properties>
<!--plugin versions-->
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-interpreter</artifactId>
- <version>${project.version}</version>
+ <version>0.9.0-SNAPSHOT</version>
<optional>true</optional>
</dependency>
</dependencies>
@@ -166,7 +166,7 @@
<target>
<echo>ANT TASK - copying files....</echo>
<copy todir="${project.basedir}/../interpreter"
overwrite="true" flatten="true">
- <fileset dir="${project.build.directory}"
includes="zeppelin-interpreter-api-*.jar" >
+ <fileset dir="${project.build.directory}"
includes="zeppelin-interpreter-shaded-*.jar" >
</fileset>
</copy>
</target>
diff --git a/zeppelin-interpreter-api/pom.xml
b/zeppelin-interpreter-shaded/zeppelin-interpreter-api/pom.xml
similarity index 96%
rename from zeppelin-interpreter-api/pom.xml
rename to zeppelin-interpreter-shaded/zeppelin-interpreter-api/pom.xml
index 280d4a6..d2cb882 100644
--- a/zeppelin-interpreter-api/pom.xml
+++ b/zeppelin-interpreter-shaded/zeppelin-interpreter-api/pom.xml
@@ -25,15 +25,15 @@
<artifactId>zeppelin</artifactId>
<groupId>org.apache.zeppelin</groupId>
<version>0.9.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.zeppelin</groupId>
- <artifactId>zeppelin-interpreter-api</artifactId>
+ <artifactId>zeppelin-interpreter-shaded</artifactId>
<packaging>jar</packaging>
<version>0.9.0-SNAPSHOT</version>
- <name>Zeppelin: Interpreter API</name>
- <description>Zeppelin Interpreter API</description>
+ <name>Zeppelin: Interpreter Shaded</name>
+ <description>Zeppelin Interpreter Shaded</description>
<properties>
<!--plugin versions-->
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-interpreter</artifactId>
- <version>${project.version}</version>
+ <version>0.9.0-SNAPSHOT</version>
<optional>true</optional>
</dependency>
</dependencies>
diff --git a/zeppelin-interpreter/pom.xml b/zeppelin-interpreter/pom.xml
index bfafe7c..b3f4269 100644
--- a/zeppelin-interpreter/pom.xml
+++ b/zeppelin-interpreter/pom.xml
@@ -25,7 +25,7 @@
<artifactId>zeppelin</artifactId>
<groupId>org.apache.zeppelin</groupId>
<version>0.9.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.zeppelin</groupId>
diff --git a/zeppelin-jupyter-interpreter-shaded/pom.xml
b/zeppelin-jupyter-interpreter-shaded/pom.xml
index d748c7d..509e82f 100644
--- a/zeppelin-jupyter-interpreter-shaded/pom.xml
+++ b/zeppelin-jupyter-interpreter-shaded/pom.xml
@@ -74,7 +74,7 @@
</transformers>
<artifactSet>
<excludes>
- <exclude>org.apache.zeppelin:zeppelin-interpreter-api</exclude>
+
<exclude>org.apache.zeppelin:zeppelin-interpreter-shaded</exclude>
</excludes>
</artifactSet>
<relocations>
diff --git
a/zeppelin-plugins/launcher/docker/src/main/java/org/apache/zeppelin/interpreter/launcher/DockerInterpreterProcess.java
b/zeppelin-plugins/launcher/docker/src/main/java/org/apache/zeppelin/interpreter/launcher/DockerInterpreterProcess.java
index f3139c6..2d64898 100644
---
a/zeppelin-plugins/launcher/docker/src/main/java/org/apache/zeppelin/interpreter/launcher/DockerInterpreterProcess.java
+++
b/zeppelin-plugins/launcher/docker/src/main/java/org/apache/zeppelin/interpreter/launcher/DockerInterpreterProcess.java
@@ -517,7 +517,7 @@ public class DockerInterpreterProcess extends
RemoteInterpreterProcess {
mkdirInContainer(containerId, intpGrpAllPath);
docker.copyToContainer(new File(intpGrpAllPath).toPath(), containerId,
intpGrpAllPath);
- // 8)
${ZEPPELIN_HOME}/lib/interpreter/zeppelin-interpreter-api-<version>.jar
+ // 8)
${ZEPPELIN_HOME}/lib/interpreter/zeppelin-interpreter-shaded-<version>.jar
// is uploaded to `${CONTAINER_ZEPPELIN_HOME}` directory in the
container
String intpPath = "/interpreter";
String intpAllPath = getPathByHome(zeppelinHome, intpPath);
