Repository: incubator-livy
Updated Branches:
refs/heads/master 6d2ffdd54 -> b9c2f1019
[LIVY-448] Assembly format is duplicated in pom.xml and assembly.xml
## What changes were proposed in this pull request?
The assembly format for Livy is specified twice:
1 in `assembly/pom.xml`:
```xml
<formats>
<format>${assembly.format}</format>
</formats>
```
2 in `assembly/assembly.xml`
```
<formats>
<format>zip</format>
</formats>
```
But only one is enough. Also in `assembly/assembly.xml`, the format is hard
coded as zip, but is should be based
## How was this patch tested?
All the unit tests and ITs pass as usual. Moreover, I tested that `targz`
profile builds a tar.gz archive and the default profile builds a zip archive.
For example,
this builds the zip archive:
```
mvn -am -pl assembly package
```
And this builds the tar.gz artifact:
```
mvn -Ptargz -am -pl assembly package
```
Task-url: https://issues.apache.org/jira/browse/LIVY-448
Author: Meisam <meisam@Hachinohe.local>
Closes #83 from meisam/LIVY-448.
Project: http://git-wip-us.apache.org/repos/asf/incubator-livy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-livy/commit/b9c2f101
Tree: http://git-wip-us.apache.org/repos/asf/incubator-livy/tree/b9c2f101
Diff: http://git-wip-us.apache.org/repos/asf/incubator-livy/diff/b9c2f101
Branch: refs/heads/master
Commit: b9c2f10194f32532009690fe89a11959c4c083c0
Parents: 6d2ffdd
Author: Meisam <meisam@Hachinohe.local>
Authored: Thu Mar 8 08:56:01 2018 +0800
Committer: jerryshao <ss...@hortonworks.com>
Committed: Thu Mar 8 08:56:01 2018 +0800
----------------------------------------------------------------------
assembly/assembly.xml | 2 +-
assembly/pom.xml | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/b9c2f101/assembly/assembly.xml
----------------------------------------------------------------------
diff --git a/assembly/assembly.xml b/assembly/assembly.xml
index b9d9416..e1dcdff 100644
--- a/assembly/assembly.xml
+++ b/assembly/assembly.xml
@@ -19,7 +19,7 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
<id>livy-server</id>
<formats>
- <format>zip</format>
+ <format>${assembly.format}</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/b9c2f101/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index c16a184..1aeb908 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -77,9 +77,6 @@
<descriptors>
<descriptor>assembly.xml</descriptor>
</descriptors>
- <formats>
- <format>${assembly.format}</format>
- </formats>
</configuration>
</execution>
</executions>
