From 76938ea35496f74efa4170f25a4090718e662e4c Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Mon, 10 Apr 2017 14:41:41 -0700
Subject: 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>
---
 ncomp-core-tools/pom.xml                       | 1 +
 ncomp-core-tools/src/assembly/assemble_zip.xml | 1 +
 2 files changed, 2 insertions(+)

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>
-- 
cgit 1.2.3-korg