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 979e133 [ZEPPELIN-4207]. zeppelin-interpreter.jar and zeppelin-interpreter-api are both used by interpreter process 979e133 is described below commit 979e133597d642024d31ea18f935bf7faf10bbf5 Author: Jeff Zhang <zjf...@apache.org> AuthorDate: Fri Jun 28 18:08:12 2019 +0800 [ZEPPELIN-4207]. zeppelin-interpreter.jar and zeppelin-interpreter-api are both used by interpreter process ### What is this PR for? zeppelin-interpreter jar (unshaded jar) should be used by zeppelin server and zeppelin-interpreter-api jar (shaded jar) should be used by interpreter process. ### What type of PR is it? [Bug Fix ] ### Todos * [ ] - Task ### What is the Jira issue? * https://jira.apache.org/jira/browse/ZEPPELIN-4207 ### 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 #3388 from zjffdu/ZEPPELIN-4207 and squashes the following commits: 510ec612a [Jeff Zhang] [ZEPPELIN-4207]. zeppelin-interpreter.jar and zeppelin-interpreter-api are both used by interpreter process --- bin/interpreter.sh | 1 - zeppelin-distribution/src/assemble/distribution.xml | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/bin/interpreter.sh b/bin/interpreter.sh index 1ad7b1d..0c09c55 100755 --- a/bin/interpreter.sh +++ b/bin/interpreter.sh @@ -84,7 +84,6 @@ if [[ -d "${ZEPPELIN_HOME}/zeppelin-zengine/target/test-classes" ]]; then fi addJarInDirForIntp "${ZEPPELIN_HOME}/zeppelin-interpreter-api/target" -addJarInDirForIntp "${ZEPPELIN_HOME}/lib/interpreter" addJarInDirForIntp "${INTERPRETER_DIR}" HOSTNAME=$(hostname) diff --git a/zeppelin-distribution/src/assemble/distribution.xml b/zeppelin-distribution/src/assemble/distribution.xml index 378ecab..0c5e8b6 100644 --- a/zeppelin-distribution/src/assemble/distribution.xml +++ b/zeppelin-distribution/src/assemble/distribution.xml @@ -39,15 +39,8 @@ <useTransitiveDependencies>false</useTransitiveDependencies> </dependencySet> <dependencySet> - <outputDirectory>/lib/interpreter</outputDirectory> - <includes> - <include>${project.groupId}:zeppelin-interpreter</include> - </includes> - </dependencySet> - <dependencySet> <outputDirectory>/lib</outputDirectory> <excludes> - <exclude>${project.groupId}:zeppelin-interpreter</exclude> <exclude>${project.groupId}:zeppelin-web</exclude> </excludes> <useProjectArtifact>false</useProjectArtifact> @@ -98,10 +91,6 @@ <directory>../k8s</directory> </fileSet> <fileSet> - <outputDirectory>/lib/interpreter</outputDirectory> - <directory>../zeppelin-interpreter/target/lib</directory> - </fileSet> - <fileSet> <outputDirectory>/lib/node_modules/zeppelin-vis</outputDirectory> <directory>../zeppelin-web/src/app/visualization</directory> </fileSet>