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

diff --git a/dblib/installer/pom.xml b/dblib/installer/pom.xml
index 7754962..08a92e1 100755 (executable)
--- a/dblib/installer/pom.xml
+++ b/dblib/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/dblib/installer/src/assembly/assemble_installer_zip.xml b/dblib/installer/src/assembly/assemble_installer_zip.xml
index 4716c7a..a6a22a9 100755 (executable)
--- a/dblib/installer/src/assembly/assemble_installer_zip.xml
+++ b/dblib/installer/src/assembly/assemble_installer_zip.xml
@@ -4,6 +4,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/dblib/installer/src/assembly/assemble_mvnrepo_zip.xml b/dblib/installer/src/assembly/assemble_mvnrepo_zip.xml
index 92cd930..d96c9f4 100755 (executable)
--- a/dblib/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/dblib/installer/src/assembly/assemble_mvnrepo_zip.xml
@@ -4,6 +4,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/filters/installer/pom.xml b/filters/installer/pom.xml
index 231aaa2..be5fd81 100755 (executable)
--- a/filters/installer/pom.xml
+++ b/filters/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/filters/installer/src/assembly/assemble_installer_zip.xml b/filters/installer/src/assembly/assemble_installer_zip.xml
index 728afca..3a5c5f6 100644 (file)
--- a/filters/installer/src/assembly/assemble_installer_zip.xml
+++ b/filters/installer/src/assembly/assemble_installer_zip.xml
@@ -25,6 +25,9 @@
        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/filters/installer/src/assembly/assemble_mvnrepo_zip.xml b/filters/installer/src/assembly/assemble_mvnrepo_zip.xml
index c14f8ae..a9fca4d 100644 (file)
--- a/filters/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/filters/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/sli/installer/pom.xml b/sli/installer/pom.xml
index 1f15d9e..d025100 100755 (executable)
--- a/sli/installer/pom.xml
+++ b/sli/installer/pom.xml
@@ -70,6 +70,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -84,6 +85,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/sli/installer/src/assembly/assemble_installer_zip.xml b/sli/installer/src/assembly/assemble_installer_zip.xml
index 728afca..85e2e1e 100644 (file)
--- a/sli/installer/src/assembly/assemble_installer_zip.xml
+++ b/sli/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/sli/installer/src/assembly/assemble_mvnrepo_zip.xml b/sli/installer/src/assembly/assemble_mvnrepo_zip.xml
index c14f8ae..38e6d47 100644 (file)
--- a/sli/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/sli/installer/src/assembly/assemble_mvnrepo_zip.xml
@@ -25,8 +25,9 @@
        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">
-       <formats>
-               <format>zip</format>
+  <id>bin</id>
+        <formats>
+                <format>zip</format>
        </formats>
 
        <!--  we want "system" and related files right at the root level

diff --git a/sliPluginUtils/installer/pom.xml b/sliPluginUtils/installer/pom.xml
index 4ab6254..22bf1e7 100755 (executable)
--- a/sliPluginUtils/installer/pom.xml
+++ b/sliPluginUtils/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/sliPluginUtils/installer/src/assembly/assemble_installer_zip.xml b/sliPluginUtils/installer/src/assembly/assemble_installer_zip.xml
index 728afca..85e2e1e 100644 (file)
--- a/sliPluginUtils/installer/src/assembly/assemble_installer_zip.xml
+++ b/sliPluginUtils/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/sliPluginUtils/installer/src/assembly/assemble_mvnrepo_zip.xml b/sliPluginUtils/installer/src/assembly/assemble_mvnrepo_zip.xml
index c14f8ae..bf7805f 100644 (file)
--- a/sliPluginUtils/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/sliPluginUtils/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/sliapi/installer/pom.xml b/sliapi/installer/pom.xml
index ec54c3e..51a956a 100755 (executable)
--- a/sliapi/installer/pom.xml
+++ b/sliapi/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/sliapi/installer/src/assembly/assemble_installer_zip.xml b/sliapi/installer/src/assembly/assemble_installer_zip.xml
index 728afca..85e2e1e 100644 (file)
--- a/sliapi/installer/src/assembly/assemble_installer_zip.xml
+++ b/sliapi/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/sliapi/installer/src/assembly/assemble_mvnrepo_zip.xml b/sliapi/installer/src/assembly/assemble_mvnrepo_zip.xml
index f026c58..18700a1 100644 (file)
--- a/sliapi/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/sliapi/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>