diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2017-04-07 12:22:23 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2017-04-07 12:53:06 -0700 |
| commit | c8a9ad49965b6152a0c7f3f4b7d1f7993d52f082 (patch) | |
| tree | f2e689de63f388b26c1f276d42d54b852c901c8f /vnfapi | |
| parent | 5da27927eac044cdec63977bf3eabee666d660f1 (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: I3a721da4aa47be58127fa3f8971f01635d400185
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'vnfapi')
| -rwxr-xr-x | vnfapi/installer/pom.xml | 2 | ||||
| -rw-r--r-- | vnfapi/installer/src/assembly/assemble_installer_zip.xml | 1 | ||||
| -rw-r--r-- | vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/vnfapi/installer/pom.xml b/vnfapi/installer/pom.xml index 88b38e93..ee681132 100755 --- a/vnfapi/installer/pom.xml +++ b/vnfapi/installer/pom.xml @@ -60,6 +60,7 @@ <descriptors> <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor> </descriptors> + <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> <execution> @@ -74,6 +75,7 @@ <descriptors> <descriptor>src/assembly/assemble_installer_zip.xml</descriptor> </descriptors> + <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> </executions> diff --git a/vnfapi/installer/src/assembly/assemble_installer_zip.xml b/vnfapi/installer/src/assembly/assemble_installer_zip.xml index 4dc572ae..f8bf5a26 100644 --- a/vnfapi/installer/src/assembly/assemble_installer_zip.xml +++ b/vnfapi/installer/src/assembly/assemble_installer_zip.xml @@ -23,6 +23,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/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml b/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml index 6e2e4204..c2b3ecc0 100644 --- a/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -23,6 +23,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> |