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: I7b0b4ac61351704b4beab073dda5779d6b6e6152
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>

diff --git a/admportal/pom.xml b/admportal/pom.xml
index 5e9cad6..4107086 100644 (file)
--- a/admportal/pom.xml
+++ b/admportal/pom.xml
@@ -46,6 +46,7 @@
                <plugins>
                        <plugin>
                                <artifactId>maven-assembly-plugin</artifactId>
+                               <version>2.6</version>
                                <executions>
                                        <execution>
                                                <id>create-zip</id>
@@ -60,6 +61,7 @@
                                                                <descriptor>src/assembly/assemble_zip.xml</descriptor>
                                                        </descriptors>
                                                        <appendAssemblyId>false</appendAssemblyId>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/admportal/src/assembly/assemble_zip.xml b/admportal/src/assembly/assemble_zip.xml
index 736c15c..de4aae8 100644 (file)
--- a/admportal/src/assembly/assemble_zip.xml
+++ b/admportal/src/assembly/assemble_zip.xml
@@ -25,7 +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>
+       <id>bin</id>
        <formats>
                <format>zip</format>
        </formats>

diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml
index abd1853..7eb1784 100644 (file)
--- a/dgbuilder/pom.xml
+++ b/dgbuilder/pom.xml
@@ -68,6 +68,7 @@
                <plugins>
                        <plugin>
                                <artifactId>maven-assembly-plugin</artifactId>
+                               <version>2.6</version>
                                <executions>
                                        <execution>
                                                <id>create-zip</id>
@@ -81,6 +82,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/dgbuilder/src/assembly/assemble_zip.xml b/dgbuilder/src/assembly/assemble_zip.xml
index 8b65f50..b994361 100644 (file)
--- a/dgbuilder/src/assembly/assemble_zip.xml
+++ b/dgbuilder/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/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml
index 837587a..50998aa 100644 (file)
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@ -48,6 +48,7 @@
                        </plugin>
                        <plugin>
                                <artifactId>maven-assembly-plugin</artifactId>
+                               <version>2.6</version>
                                <executions>
                                        <execution>
                                                <id>create-zip</id>
@@ -60,6 +61,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
 

diff --git a/platform-logic/installer/src/assembly/assemble_zip.xml b/platform-logic/installer/src/assembly/assemble_zip.xml
index b704ac1..5e62ecb 100644 (file)
--- a/platform-logic/installer/src/assembly/assemble_zip.xml
+++ b/platform-logic/installer/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>