From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 7 Apr 2017 19:24:49 +0000 (-0700)
Subject: Fix assembly xmls for maven-assembly-plugin v2.2+
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F99%2F3199%2F1;p=sdnc%2Fplugins.git

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: Iab4a2d80f1efdc3a6132e654bf47f9e9d0e3cbcb
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

diff --git a/properties-node/installer/pom.xml b/properties-node/installer/pom.xml
index 23b2526..69b019f 100755
--- a/properties-node/installer/pom.xml
+++ b/properties-node/installer/pom.xml
@@ -59,6 +59,7 @@
 							<descriptors>
 								<descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
 							</descriptors>
+							<appendAssemblyId>false</appendAssemblyId>
 						</configuration>
 					</execution>
 					<execution>
@@ -73,6 +74,7 @@
 							<descriptors>
 								<descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
 							</descriptors>
+							<appendAssemblyId>false</appendAssemblyId>
 						</configuration>
 					</execution>
 				</executions>
diff --git a/properties-node/installer/src/assembly/assemble_installer_zip.xml b/properties-node/installer/src/assembly/assemble_installer_zip.xml
index 728afca..85e2e1e 100644
--- a/properties-node/installer/src/assembly/assemble_installer_zip.xml
+++ b/properties-node/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/properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml b/properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml
index c14f8ae..bf7805f 100644
--- a/properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/properties-node/installer/src/assembly/assemble_mvnrepo_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/restapi-call-node/installer/pom.xml b/restapi-call-node/installer/pom.xml
index 0e88789..c84b301 100755
--- a/restapi-call-node/installer/pom.xml
+++ b/restapi-call-node/installer/pom.xml
@@ -59,6 +59,7 @@
 							<descriptors>
 								<descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
 							</descriptors>
+							<appendAssemblyId>false</appendAssemblyId>
 						</configuration>
 					</execution>
 					<execution>
@@ -73,6 +74,7 @@
 							<descriptors>
 								<descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
 							</descriptors>
+							<appendAssemblyId>false</appendAssemblyId>
 						</configuration>
 					</execution>
 				</executions>
diff --git a/restapi-call-node/installer/src/assembly/assemble_installer_zip.xml b/restapi-call-node/installer/src/assembly/assemble_installer_zip.xml
index 728afca..85e2e1e 100644
--- a/restapi-call-node/installer/src/assembly/assemble_installer_zip.xml
+++ b/restapi-call-node/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/restapi-call-node/installer/src/assembly/assemble_mvnrepo_zip.xml b/restapi-call-node/installer/src/assembly/assemble_mvnrepo_zip.xml
index c14f8ae..bf7805f 100644
--- a/restapi-call-node/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/restapi-call-node/installer/src/assembly/assemble_mvnrepo_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>