diff options
| author |   Dan Timoney <dtimoney@att.com> | 2017-04-12 17:14:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-04-12 17:14:43 +0000 |
| commit | 028b30e6a8391077ed836a380e41e26991c3981d (patch) | |
| tree | 027eb906017347be4ba6640ce2f950127791a877 /sli | |
| parent | 52b45c0fdb16f9fecff227c3c0e3ada4b3cf70fd (diff) | |
| parent | 4cb7d42a16bcc09c14a45825ea7c30bc588689bf (diff) | |
Merge "Fix assembly xmls for maven-assembly-plugin v2.2+"
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 |