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

diff --git a/asdcApi/installer/pom.xml b/asdcApi/installer/pom.xml
index ced3c3d..f97c537 100755 (executable)
--- a/asdcApi/installer/pom.xml
+++ b/asdcApi/installer/pom.xml
@@ -47,6 +47,7 @@
                <plugins>
                        <plugin>
                                <artifactId>maven-assembly-plugin</artifactId>
+                               <version>2.6</version>
                                <executions>
                                        <execution>
                                                <id>maven-repo-zip</id>
@@ -60,6 +61,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -74,6 +76,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..1bb0d08 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>installer_zip</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..4924402 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>mvnrepo_zip</id>
        <formats>
                <format>zip</format>
        </formats>

diff --git a/dataChange/installer/pom.xml b/dataChange/installer/pom.xml
index 5b8462d..adc2d14 100755 (executable)
--- a/dataChange/installer/pom.xml
+++ b/dataChange/installer/pom.xml
@@ -47,6 +47,7 @@
                <plugins>
                        <plugin>
                                <artifactId>maven-assembly-plugin</artifactId>
+                               <version>2.6</version>
                                <executions>
                                        <execution>
                                                <id>maven-repo-zip</id>
@@ -60,6 +61,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -74,6 +76,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..1bb0d08 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>installer_zip</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..4924402 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>mvnrepo_zip</id>
        <formats>
                <format>zip</format>
        </formats>

diff --git a/dmaap-listener/pom.xml b/dmaap-listener/pom.xml
index 58d23ae..944ca86 100755 (executable)
--- a/dmaap-listener/pom.xml
+++ b/dmaap-listener/pom.xml
@@ -88,6 +88,7 @@
 
                        <plugin>
                                <artifactId>maven-assembly-plugin</artifactId>
+                               <version>2.6</version>
                                <executions>
                                        <execution>
                                                <id>create-zip</id>
@@ -102,6 +103,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/dmaap-listener/src/assembly/assemble_zip.xml b/dmaap-listener/src/assembly/assemble_zip.xml
index 4874d00..bd0cdd5 100644 (file)
--- a/dmaap-listener/src/assembly/assemble_zip.xml
+++ b/dmaap-listener/src/assembly/assemble_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>assemble_zip</id>
        <formats>
                <format>zip</format>
        </formats>

diff --git a/ueb-listener/pom.xml b/ueb-listener/pom.xml
index eda454c..23ebd53 100755 (executable)
--- a/ueb-listener/pom.xml
+++ b/ueb-listener/pom.xml
@@ -101,6 +101,7 @@
 
                        <plugin>
                                <artifactId>maven-assembly-plugin</artifactId>
+                               <version>2.6</version>
                                <executions>
                                        <execution>
                                                <id>create-zip</id>
@@ -115,6 +116,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 29e3b41..d18a0a4 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>assemble_zip</id>
        <formats>
                <format>zip</format>
        </formats>

diff --git a/vnfapi/installer/pom.xml b/vnfapi/installer/pom.xml
index 3fa0ac7..3fd9885 100755 (executable)
--- a/vnfapi/installer/pom.xml
+++ b/vnfapi/installer/pom.xml
@@ -47,6 +47,7 @@
                <plugins>
                        <plugin>
                                <artifactId>maven-assembly-plugin</artifactId>
+                               <version>2.6</version>
                                <executions>
                                        <execution>
                                                <id>maven-repo-zip</id>
@@ -60,6 +61,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -74,6 +76,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 c7fb0c1..13156fd 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>installer_zip</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 b37b3f1..162ce10 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>mvnrepo_zip</id>
     <formats>
         <format>zip</format>
     </formats>

diff --git a/vnftools/installer/pom.xml b/vnftools/installer/pom.xml
index 9138fe0..c3436f7 100755 (executable)
--- a/vnftools/installer/pom.xml
+++ b/vnftools/installer/pom.xml
@@ -47,6 +47,7 @@
                <plugins>
                        <plugin>
                                <artifactId>maven-assembly-plugin</artifactId>
+                               <version>2.6</version>
                                <executions>
                                        <execution>
                                                <id>maven-repo-zip</id>
@@ -60,6 +61,7 @@
                                                        <descriptors>
                                                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
                                                        </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -74,6 +76,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..1bb0d08 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>installer_zip</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..6eb4554 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>mvnrepo_zip</id>
        <formats>
                <format>zip</format>
        </formats>