From e0dad2e0147ead960f34ddb8252ddd1cb550bfc4 Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Thu, 13 Apr 2017 12:04:33 -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: I65d79aa4b24759f6b9a3fe8118b888e1672fdf60
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---
 openecomp-be/tools/swagger-ui/assembly/swagger.xml | 3 ++-
 openecomp-be/tools/swagger-ui/pom.xml              | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'openecomp-be')

diff --git a/openecomp-be/tools/swagger-ui/assembly/swagger.xml b/openecomp-be/tools/swagger-ui/assembly/swagger.xml
index 769cc64840..b88714254f 100644
--- a/openecomp-be/tools/swagger-ui/assembly/swagger.xml
+++ b/openecomp-be/tools/swagger-ui/assembly/swagger.xml
@@ -2,6 +2,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>war</format>
     </formats>
@@ -73,4 +74,4 @@
             </includes>
         </fileSet>
     </fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/openecomp-be/tools/swagger-ui/pom.xml b/openecomp-be/tools/swagger-ui/pom.xml
index b2b608cd3a..4a354624ee 100644
--- a/openecomp-be/tools/swagger-ui/pom.xml
+++ b/openecomp-be/tools/swagger-ui/pom.xml
@@ -91,6 +91,7 @@
                     <descriptor>assembly/swagger.xml</descriptor>
                     <finalName>${plugin.name}</finalName>
                     <outputDirectory>${package.dir}</outputDirectory>
+                    <appendAssemblyId>false</appendAssemblyId>
                 </configuration>
                 <executions>
                     <execution>
-- 
cgit 1.2.3-korg

olulu</option>
<option value='istanbul'>istanbul</option>
<option value='jakarta'>jakarta</option>
<option value='kafka-config'>kafka-config</option>
<option value='kohn'>kohn</option>
<option value='london'>london</option>
<option value='master'>master</option>
<option value='montreal'>montreal</option>
<option value='release-1.0.0'>release-1.0.0</option>
<option value='release-1.1.0'>release-1.1.0</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>SDC Parent Project Catalog FE and BE</td><td class='sub right'>Grokmirror user</td></tr></table>
<table class='tabs'><tr><td>
<a href='/sdc/?h=1.11.3'>summary</a><a href='/sdc/refs/?h=1.11.3&amp;id=280f8015d06af1f41a3ef12e8300801c7a5e0d54'>refs</a><a href='/sdc/log/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBCloudConfig?h=1.11.3'>log</a><a class='active' href='/sdc/tree/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBCloudConfig?h=1.11.3&amp;id=280f8015d06af1f41a3ef12e8300801c7a5e0d54'>tree</a><a href='/sdc/commit/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBCloudConfig?h=1.11.3&amp;id=280f8015d06af1f41a3ef12e8300801c7a5e0d54'>commit</a><a href='/sdc/diff/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBCloudConfig?h=1.11.3&amp;id=280f8015d06af1f41a3ef12e8300801c7a5e0d54'>diff</a><a href='/sdc/stats/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBCloudConfig?h=1.11.3'>stats</a></td><td class='form'><form class='right' method='get' action='/sdc/log/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBCloudConfig'>
<input type='hidden' name='h' value='1.11.3'/><input type='hidden' name='id' value='280f8015d06af1f41a3ef12e8300801c7a5e0d54'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/sdc/tree/?h=1.11.3&amp;id=280f8015d06af1f41a3ef12e8300801c7a5e0d54'>root</a>/<a href='/sdc/tree/openecomp-be?h=1.11.3&amp;id=280f8015d06af1f41a3ef12e8300801c7a5e0d54'>openecomp-be</a>/<a href='/sdc/tree/openecomp-be/lib?h=1.11.3&amp;id=280f8015d06af1f41a3ef12e8300801c7a5e0d54'>lib</a>/<a href='/sdc/tree/openecomp-be/lib/openecomp-sdc-translator-lib?h=1.11.3&amp;id=280f8015d06af1f41a3ef12e8300801c7a5e0d54'>openecomp-sdc-translator-lib</a>/<a href='/sdc/tree/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core?h=1.11.3&amp;id=280f8015d06af1f41a3ef12e8300801c7a5e0d54'>openecomp-sdc-translator-core</a>/<a href='/sdc/tree/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src?h=1.11.3&amp;id=280f8015d06af1f41a3ef12e8300801c7a5e0d54'>src</a>/<a href='/sdc/tree/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test?h=1.11.3&amp;id=280f8015d06af1f41a3ef12e8300801c7a5e0d54'>test</a>/<a href='/sdc/tree/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources?h=1.11.3&amp;id=280f8015d06af1f41a3ef12e8300801c7a5e0d54'>resources</a>/<a href='/sdc/tree/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock?h=1.11.3&amp;id=280f8015d06af1f41a3ef12e8300801c7a5e0d54'>mock</a>/<a href='/sdc/tree/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services?h=1.11.3&amp;id=280f8015d06af1f41a3ef12e8300801c7a5e0d54'>services</a>/<a href='/sdc/tree/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca?h=1.11.3&amp;id=280f8015d06af1f41a3ef12e8300801c7a5e0d54'>heattotosca</a>/<a href='/sdc/tree/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection?h=1.11.3&amp;id=280f8015d06af1f41a3ef12e8300801c7a5e0d54'>securityrulestoportconnection</a>/<a href='/sdc/tree/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource?h=1.11.3&amp;id=280f8015d06af1f41a3ef12e8300801c7a5e0d54'>securityRulesToPortGetResource</a>/<a href='/sdc/tree/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles?h=1.11.3&amp;id=280f8015d06af1f41a3ef12e8300801c7a5e0d54'>inputfiles</a>/<a href='/sdc/tree/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBCloudConfig?h=1.11.3&amp;id=280f8015d06af1f41a3ef12e8300801c7a5e0d54'>FEAdd_On_Module_vLBCloudConfig</a></div><div class='content'>blob: 78b6c652ce6e11eb5ea617fa1ff18fa13ae0ec58 (<a href='/sdc/plain/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBCloudConfig?h=1.11.3&amp;id=280f8015d06af1f41a3ef12e8300801c7a5e0d54'>plain</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
<a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
<a id='n6' href='#n6'>6</a>
<a id='n7' href='#n7'>7</a>
<a id='n8' href='#n8'>8</a>
<a id='n9' href='#n9'>9</a>
<a id='n10' href='#n10'>10</a>
<a id='n11' href='#n11'>11</a>
<a id='n12' href='#n12'>12</a>
<a id='n13' href='#n13'>13</a>
<a id='n14' href='#n14'>14</a>
<a id='n15' href='#n15'>15</a>
<a id='n16' href='#n16'>16</a>
<a id='n17' href='#n17'>17</a>
<a id='n18' href='#n18'>18</a>
<a id='n19' href='#n19'>19</a>
<a id='n20' href='#n20'>20</a>
<a id='n21' href='#n21'>21</a>
<a id='n22' href='#n22'>22</a>
<a id='n23' href='#n23'>23</a>
<a id='n24' href='#n24'>24</a>
<a id='n25' href='#n25'>25</a>
<a id='n26' href='#n26'>26</a>
<a id='n27' href='#n27'>27</a>
<a id='n28' href='#n28'>28</a>
<a id='n29' href='#n29'>29</a>
<a id='n30' href='#n30'>30</a>
<a id='n31' href='#n31'>31</a>
<a id='n32' href='#n32'>32</a>
<a id='n33' href='#n33'>33</a>
<a id='n34' href='#n34'>34</a>
<a id='n35' href='#n35'>35</a>
<a id='n36' href='#n36'>36</a>
<a id='n37' href='#n37'>37</a>
<a id='n38' href='#n38'>38</a>
<a id='n39' href='#n39'>39</a>
<a id='n40' href='#n40'>40</a>
<a id='n41' href='#n41'>41</a>
</pre></td>
<td class='lines'><pre><code>