From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 7 Apr 2017 19:26:14 +0000 (-0700)
Subject: Fix assembly xmls for maven-assembly-plugin v2.2+
X-Git-Tag: v1.2.1~172
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=ac889177cc3086d57545abcfcd01986340db424e;p=sdnc%2Foam.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: I95df31b2eb880eb6d2a466eafcc57206f9d3d516
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

Former-commit-id: 59263d726d0c6811c7608a0cbbbff18f74aa8c22
---

diff --git a/admportal/pom.xml b/admportal/pom.xml
index 1c1c0452..70733bd6 100644
--- a/admportal/pom.xml
+++ b/admportal/pom.xml
@@ -59,6 +59,7 @@
 							<descriptors>
 								<descriptor>src/assembly/assemble_zip.xml</descriptor>
 							</descriptors>
+							<appendAssemblyId>false</appendAssemblyId>
 						</configuration>
 					</execution>
 				</executions>
diff --git a/admportal/src/assembly/assemble_zip.xml b/admportal/src/assembly/assemble_zip.xml
index 2c96aa32..736c15cc 100644
--- a/admportal/src/assembly/assemble_zip.xml
+++ b/admportal/src/assembly/assemble_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/dgbuilder/pom.xml b/dgbuilder/pom.xml
index 6c185bbf..0b5386dc 100644
--- a/dgbuilder/pom.xml
+++ b/dgbuilder/pom.xml
@@ -81,6 +81,7 @@
 							<descriptors>
 								<descriptor>src/assembly/assemble_zip.xml</descriptor>
 							</descriptors>
+							<appendAssemblyId>false</appendAssemblyId>
 						</configuration>
 					</execution>
 				</executions>
diff --git a/dgbuilder/src/assembly/assemble_zip.xml b/dgbuilder/src/assembly/assemble_zip.xml
index 7bf22d22..1c51346b 100644
--- a/dgbuilder/src/assembly/assemble_zip.xml
+++ b/dgbuilder/src/assembly/assemble_zip.xml
@@ -25,6 +25,8 @@
 	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/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml
index 95fa8c98..093dcc63 100644
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@ -60,6 +60,7 @@
 							<descriptors>
 								<descriptor>src/assembly/assemble_zip.xml</descriptor>
 							</descriptors>
+							<appendAssemblyId>false</appendAssemblyId>
 						</configuration>
 					</execution>
 
diff --git a/platform-logic/installer/src/assembly/assemble_zip.xml b/platform-logic/installer/src/assembly/assemble_zip.xml
index b704ac1c..2de402e2 100644
--- a/platform-logic/installer/src/assembly/assemble_zip.xml
+++ b/platform-logic/installer/src/assembly/assemble_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>