You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by jo...@apache.org on 2016/11/01 05:55:37 UTC
zeppelin git commit: [ZEPPELIN-1435] Move zeppelin-server-*.jar under
lib in distribution binary package
Repository: zeppelin
Updated Branches:
refs/heads/master fd545e295 -> ddf1bcfe4
[ZEPPELIN-1435] Move zeppelin-server-*.jar under lib in distribution binary package
### What is this PR for?
Move zeppelin-server-*.jar package under `lib` directory like other zeppelin modules such as `zeppelin-engine`, `zeppelin-interpreter`
### What type of PR is it?
Refactoring
### What is the Jira issue?
[ZEPPELIN-1435](https://issues.apache.org/jira/browse/ZEPPELIN-1435)
### How should this be tested?
Build with:
```
mvn clean package -DskipTests -Pbuild-distr -pl '!alluxio,!angular,!cassandra,!elasticsearch,!file,!flink,!hbase,!ignite,!jdbc,!kylin,!lens,!livy,!postgresql,!python,!shell,!bigquery'
```
and check if `zeppelin-server-0.7.0-SNAPSHOT.jar` file is placed under `zeppelin-distribution/target/zeppelin-0.7.0-SNAPSHOT/zeppelin-0.7.0-SNAPSHOT/lib` not `zeppelin-distribution/target/zeppelin-0.7.0-SNAPSHOT/zeppelin-0.7.0-SNAPSHOT`
### Questions:
- Does the licenses files need update? no
- Is there breaking changes for older versions? no
- Does this needs documentation? no
Author: Mina Lee <mi...@apache.org>
Closes #1427 from minahlee/ZEPPELIN-1435 and squashes the following commits:
03a018f [Mina Lee] Move zeppelin-server-*.jar under lib in distribution binary package
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/ddf1bcfe
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/ddf1bcfe
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/ddf1bcfe
Branch: refs/heads/master
Commit: ddf1bcfe4cf099681c7bcbe1a9341a035937b909
Parents: fd545e2
Author: Mina Lee <mi...@apache.org>
Authored: Tue Sep 13 15:42:03 2016 +0200
Committer: Jongyoul Lee <jo...@apache.org>
Committed: Tue Nov 1 14:55:30 2016 +0900
----------------------------------------------------------------------
zeppelin-distribution/README.md | 12 +++---------
zeppelin-distribution/src/assemble/distribution.xml | 2 --
2 files changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ddf1bcfe/zeppelin-distribution/README.md
----------------------------------------------------------------------
diff --git a/zeppelin-distribution/README.md b/zeppelin-distribution/README.md
index b5dd2e0..312b27f 100644
--- a/zeppelin-distribution/README.md
+++ b/zeppelin-distribution/README.md
@@ -23,18 +23,12 @@ Apache Zeppelin is distributed as a single gzip archive with the following struc
Zeppelin
\u251c\u2500\u2500 bin
\u2502 \u251c\u2500\u2500 zeppelin.sh
- \u2502 \u2514\u2500\u2500 seppelin-deamon.sh
+ \u2502 \u2514\u2500\u2500 zeppelin-daemon.sh
\u251c\u2500\u2500 conf
\u251c\u2500\u2500 interpreter
\u251c\u2500\u2500 lib
\u251c\u2500\u2500 licenses
- \u251c\u2500\u2500 zan-repo
- \u2502 \u251c\u2500\u2500 txt.wordcount
- \u2502 \u251c\u2500\u2500 vis.bubble
- \u2502 \u251c\u2500\u2500 vis.gchart
- \u2502 \u251c\u2500\u2500 ml.something
- \u2502 \u2514\u2500\u2500 ...
- \u251c\u2500\u2500 zeppelin-server-<verion>.jar
+ \u251c\u2500\u2500 notebook
\u2514\u2500\u2500 zeppelin-web-<verion>.war
```
@@ -42,4 +36,4 @@ Zeppelin
We use `maven-assembly-plugin` to build it, see `zeppelin-distribution/src/assemble/distribution.xml ` for details.
>**IMPORTANT:** `_/lib_` subdirectory contains all transitive dependencies of the `zeppelin-distribution` module,
-automatically resolved by maven, except for explicitly excluded `_server_` and `_web_` Zeppelin sub-modules.
+automatically resolved by maven, except for explicitly excluded `_web_` Zeppelin sub-modules.
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ddf1bcfe/zeppelin-distribution/src/assemble/distribution.xml
----------------------------------------------------------------------
diff --git a/zeppelin-distribution/src/assemble/distribution.xml b/zeppelin-distribution/src/assemble/distribution.xml
index 4750a72..4351984 100644
--- a/zeppelin-distribution/src/assemble/distribution.xml
+++ b/zeppelin-distribution/src/assemble/distribution.xml
@@ -33,7 +33,6 @@
<useAllReactorProjects>true</useAllReactorProjects> -->
<!-- Now, select which projects to include in this module-set. -->
<includes>
- <include>org.apache.zeppelin:zeppelin-server</include>
<include>org.apache.zeppelin:zeppelin-web</include>
</includes>
<useProjectArtifact>false</useProjectArtifact>
@@ -44,7 +43,6 @@
<useProjectArtifact>false</useProjectArtifact>
<excludes>
<exclude>${project.groupId}:zeppelin-web</exclude>
- <exclude>${project.groupId}:zeppelin-server</exclude>
</excludes>
</dependencySet>
</dependencySets>