aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2017-04-10 14:41:41 -0700
committerGary Wu <gary.i.wu@huawei.com>2017-04-19 01:42:54 +0000
commit76938ea35496f74efa4170f25a4090718e662e4c (patch)
tree761827b07e8890d4d8e68efad69a8fa225b848b9
parent4d1b7e6c8d54c914d23fb1aa2142e4166f694037 (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: I0d1384df3c1a0e4c29c2f7adad4cf1738683c74a Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rw-r--r--ncomp-core-tools/pom.xml1
-rw-r--r--ncomp-core-tools/src/assembly/assemble_zip.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/ncomp-core-tools/pom.xml b/ncomp-core-tools/pom.xml
index f02113b..71b7cc9 100644
--- a/ncomp-core-tools/pom.xml
+++ b/ncomp-core-tools/pom.xml
@@ -60,6 +60,7 @@
<descriptors>
<descriptor>src/assembly/assemble_zip.xml</descriptor>
</descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
</executions>
diff --git a/ncomp-core-tools/src/assembly/assemble_zip.xml b/ncomp-core-tools/src/assembly/assemble_zip.xml
index e3f597c..d4c5c36 100644
--- a/ncomp-core-tools/src/assembly/assemble_zip.xml
+++ b/ncomp-core-tools/src/assembly/assemble_zip.xml
@@ -4,6 +4,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>