diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2017-04-07 11:46:29 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2017-04-07 12:52:17 -0700 |
| commit | 4cb7d42a16bcc09c14a45825ea7c30bc588689bf (patch) | |
| tree | 765ba116c9c52f486b424f913e83448c6e9c898d /sli | |
| parent | 75950bf862be183d9a2d64ad0ed4dafe30959184 (diff) | |
Fix assembly xmls for maven-assembly-plugin v2.2+
Starting in version 2.2, maven-assembly-plugin
requires an id tag in the assembly descriptor xmls.
This patch allows the project to be built in
environments that use newer versions of
maven-assembly-plugin.
For details, see:
https://issues.apache.org/jira/browse/MASSEMBLY-517
Change-Id: I4eccccd8c1f9ffb510461507de8a88952ee8a0b3
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'sli')
| -rwxr-xr-x | sli/installer/pom.xml | 2 | ||||
| -rw-r--r-- | sli/installer/src/assembly/assemble_installer_zip.xml | 1 | ||||
| -rw-r--r-- | sli/installer/src/assembly/assemble_mvnrepo_zip.xml | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml index 1f15d9e..d025100 100755 --- a/sli/installer/pom.xml +++ b/sli/installer/pom.xml @@ -70,6 +70,7 @@ <descriptors> <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor> </descriptors> + <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> <execution> @@ -84,6 +85,7 @@ <descriptors> <descriptor>src/assembly/assemble_installer_zip.xml</descriptor> </descriptors> + <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> </executions> diff --git a/sli/installer/src/assembly/assemble_installer_zip.xml b/sli/installer/src/assembly/assemble_installer_zip.xml index 728afca..85e2e1e 100644 --- a/sli/installer/src/assembly/assemble_installer_zip.xml +++ b/sli/installer/src/assembly/assemble_installer_zip.xml @@ -25,6 +25,7 @@ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>bin</id> <formats> <format>zip</format> </formats> diff --git a/sli/installer/src/assembly/assemble_mvnrepo_zip.xml b/sli/installer/src/assembly/assemble_mvnrepo_zip.xml index c14f8ae..38e6d47 100644 --- a/sli/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/sli/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -25,8 +25,9 @@ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - <formats> - <format>zip</format> + <id>bin</id> + <formats> + <format>zip</format> </formats> <!-- we want "system" and related files right at the root level |