From ec0f99bdd24468c1f662d6fcf6e2ca29b678da73 Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 7 Apr 2017 12:10:18 -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: I05702244730ca0419d3250f969d9d2aed69bec00
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---
 mdsal-resource/installer/pom.xml                                 | 2 ++
 mdsal-resource/installer/src/assembly/assemble_installer_zip.xml | 3 ++-
 mdsal-resource/installer/src/assembly/assemble_mvnrepo_zip.xml   | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'mdsal-resource')

diff --git a/mdsal-resource/installer/pom.xml b/mdsal-resource/installer/pom.xml
index ba14b75..5a29d85 100755
--- a/mdsal-resource/installer/pom.xml
+++ b/mdsal-resource/installer/pom.xml
@@ -58,6 +58,7 @@
 							<descriptors>
 								<descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
 							</descriptors>
+							<appendAssemblyId>false</appendAssemblyId>
 						</configuration>
 					</execution>
 					<execution>
@@ -72,6 +73,7 @@
 							<descriptors>
 								<descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
 							</descriptors>
+							<appendAssemblyId>false</appendAssemblyId>
 						</configuration>
 					</execution>
 				</executions>
diff --git a/mdsal-resource/installer/src/assembly/assemble_installer_zip.xml b/mdsal-resource/installer/src/assembly/assemble_installer_zip.xml
index 0ce9b1a..85e2e1e 100644
--- a/mdsal-resource/installer/src/assembly/assemble_installer_zip.xml
+++ b/mdsal-resource/installer/src/assembly/assemble_installer_zip.xml
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-              reserved.
+  						reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -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/mdsal-resource/installer/src/assembly/assemble_mvnrepo_zip.xml b/mdsal-resource/installer/src/assembly/assemble_mvnrepo_zip.xml
index ba21dda..bf7805f 100644
--- a/mdsal-resource/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/mdsal-resource/installer/src/assembly/assemble_mvnrepo_zip.xml
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-              reserved.
+  						reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -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>
-- 
cgit 1.2.3-korg