fix maven local build issue

onap jenkins use maven-assembly-plugin 2.2-beta-5. without fix, local build use
maven-assembly-plugin 2.4.1 and build fails as:
Assembly is incorrectly configured: null.

to fix local build issue:
1. update to maven-assembly-plugin 2.6
2. add AssemblyId configuration which is needed for assembly >= 2.2

Change-Id: Icb1178b5c254ce188345cf1ee5381b442c8e668d
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>

diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml
index 65d850c..95db981 100644 (file)
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@ -46,6 +46,7 @@
                        </plugin>
                        <plugin>
                                <artifactId>maven-assembly-plugin</artifactId>
                        </plugin>
                        <plugin>
                                <artifactId>maven-assembly-plugin</artifactId>

+                               <version>2.6</version>

                                <executions>
                                        <execution>
                                                <id>create-zip</id>
                                <executions>
                                        <execution>
                                                <id>create-zip</id>


@@ -58,6 +59,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_zip.xml</descriptor>
                                                        </descriptors>
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_zip.xml</descriptor>
                                                        </descriptors>

+                                                       <appendAssemblyId>false</appendAssemblyId>

                                                </configuration>
                                        </execution>
 
                                                </configuration>
                                        </execution>
 

diff --git a/platform-logic/installer/src/assembly/assemble_zip.xml b/platform-logic/installer/src/assembly/assemble_zip.xml
index 5ff5bc6..2db7334 100644 (file)
--- a/platform-logic/installer/src/assembly/assemble_zip.xml
+++ b/platform-logic/installer/src/assembly/assemble_zip.xml
@@ -24,6 +24,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">
        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>
        <formats>
                <format>zip</format>
        </formats>