You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2015/12/11 03:29:47 UTC
incubator-zeppelin git commit: [ZEPPELIN-495] Enable running
interpreters with distribution package
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master 664a13a2f -> b22fe2fa8
[ZEPPELIN-495] Enable running interpreters with distribution package
In distribution package, zeppelin-interpreter module is not added to classpath when Zeppelin starts interpreter process.
This PR packages zeppelin-interpreter classes and dependencies into one jar file, and adds this jar to classpath.
Author: Mina Lee <mi...@nflabs.com>
Closes #524 from minahlee/ZEPPELIN-495 and squashes the following commits:
efc5f31 [Mina Lee] [ZEPPELIN-495] Exclude dependency-reduced-pom.xml from license check
401a6cb [Mina Lee] [ZEPPELIN-495] Enable running interpreters with distribution package
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/b22fe2fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/b22fe2fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/b22fe2fa
Branch: refs/heads/master
Commit: b22fe2fa8e0b1203de82e74f63ac32f0523170a2
Parents: 664a13a
Author: Mina Lee <mi...@nflabs.com>
Authored: Wed Dec 9 14:46:17 2015 -0800
Committer: Lee moon soo <mo...@apache.org>
Committed: Fri Dec 11 11:30:58 2015 +0900
----------------------------------------------------------------------
bin/interpreter.sh | 3 +++
zeppelin-interpreter/pom.xml | 54 +++++++++++++++++++++++++++++++++++++++
2 files changed, 57 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/b22fe2fa/bin/interpreter.sh
----------------------------------------------------------------------
diff --git a/bin/interpreter.sh b/bin/interpreter.sh
index 28424c8..91c9b92 100755
--- a/bin/interpreter.sh
+++ b/bin/interpreter.sh
@@ -52,6 +52,9 @@ ZEPPELIN_CLASSPATH+=":${ZEPPELIN_CONF_DIR}"
# construct classpath
if [[ -d "${ZEPPELIN_HOME}/zeppelin-interpreter/target/classes" ]]; then
ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-interpreter/target/classes"
+else
+ ZEPPELIN_INTERPRETER_JAR="$(ls ${ZEPPELIN_HOME}/lib/zeppelin-interpreter*.jar)"
+ ZEPPELIN_CLASSPATH+=":${ZEPPELIN_INTERPRETER_JAR}"
fi
addJarInDir "${ZEPPELIN_HOME}/zeppelin-interpreter/target/lib"
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/b22fe2fa/zeppelin-interpreter/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-interpreter/pom.xml b/zeppelin-interpreter/pom.xml
index 426878a..59d2cd0 100644
--- a/zeppelin-interpreter/pom.xml
+++ b/zeppelin-interpreter/pom.xml
@@ -91,10 +91,64 @@
<version>1.9.0</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang.version}</version>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/.idea/</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>.gitignore</exclude>
+ <exclude>**/.settings/*</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>*.md</exclude>
+ <exclude>dependency-reduced-pom.xml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>*:*</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>