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

diff --git a/asdcApi/installer/pom.xml b/asdcApi/installer/pom.xml
index f5c3771..764c866 100755 (executable)
--- a/asdcApi/installer/pom.xml
+++ b/asdcApi/installer/pom.xml
@@ -60,6 +60,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -74,6 +75,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/asdcApi/installer/src/assembly/assemble_installer_zip.xml b/asdcApi/installer/src/assembly/assemble_installer_zip.xml
index 728afca..85e2e1e 100644 (file)
--- a/asdcApi/installer/src/assembly/assemble_installer_zip.xml
+++ b/asdcApi/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/asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml b/asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml
index b4d2d61..73afa1c 100644 (file)
--- a/asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/asdcApi/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/dataChange/installer/pom.xml b/dataChange/installer/pom.xml
index 7ab3209..0eeea7a 100755 (executable)
--- a/dataChange/installer/pom.xml
+++ b/dataChange/installer/pom.xml
@@ -60,6 +60,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -74,6 +75,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/dataChange/installer/src/assembly/assemble_installer_zip.xml b/dataChange/installer/src/assembly/assemble_installer_zip.xml
index 728afca..85e2e1e 100644 (file)
--- a/dataChange/installer/src/assembly/assemble_installer_zip.xml
+++ b/dataChange/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/dataChange/installer/src/assembly/assemble_mvnrepo_zip.xml b/dataChange/installer/src/assembly/assemble_mvnrepo_zip.xml
index b4d2d61..73afa1c 100644 (file)
--- a/dataChange/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/dataChange/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/ueb-listener/pom.xml b/ueb-listener/pom.xml
index ada3d87..91ef89f 100755 (executable)
--- a/ueb-listener/pom.xml
+++ b/ueb-listener/pom.xml
@@ -99,6 +99,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/ueb-listener/src/assembly/assemble_zip.xml b/ueb-listener/src/assembly/assemble_zip.xml
index f87a648..48aafa5 100644 (file)
--- a/ueb-listener/src/assembly/assemble_zip.xml
+++ b/ueb-listener/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/vnfapi/installer/pom.xml b/vnfapi/installer/pom.xml
index 88b38e9..ee68113 100755 (executable)
--- a/vnfapi/installer/pom.xml
+++ b/vnfapi/installer/pom.xml
@@ -60,6 +60,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -74,6 +75,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/vnfapi/installer/src/assembly/assemble_installer_zip.xml b/vnfapi/installer/src/assembly/assemble_installer_zip.xml
index 4dc572a..f8bf5a2 100644 (file)
--- a/vnfapi/installer/src/assembly/assemble_installer_zip.xml
+++ b/vnfapi/installer/src/assembly/assemble_installer_zip.xml
@@ -23,6 +23,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/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml b/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml
index 6e2e420..c2b3ecc 100644 (file)
--- a/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml
@@ -23,6 +23,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/vnftools/installer/pom.xml b/vnftools/installer/pom.xml
index d08e313..796b159 100755 (executable)
--- a/vnftools/installer/pom.xml
+++ b/vnftools/installer/pom.xml
@@ -60,6 +60,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -74,6 +75,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/vnftools/installer/src/assembly/assemble_installer_zip.xml b/vnftools/installer/src/assembly/assemble_installer_zip.xml
index 728afca..85e2e1e 100644 (file)
--- a/vnftools/installer/src/assembly/assemble_installer_zip.xml
+++ b/vnftools/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/vnftools/installer/src/assembly/assemble_mvnrepo_zip.xml b/vnftools/installer/src/assembly/assemble_mvnrepo_zip.xml
index c14f8ae..bf7805f 100644 (file)
--- a/vnftools/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/vnftools/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>