From 116bb8574066cc0175a54371269707bc0e94e6d7 Mon Sep 17 00:00:00 2001 From: Guo Ruijing Date: Wed, 3 May 2017 23:55:30 +0000 Subject: [PATCH] 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 --- asdcApi/installer/pom.xml | 3 +++ asdcApi/installer/src/assembly/assemble_installer_zip.xml | 1 + asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml | 1 + dataChange/installer/pom.xml | 3 +++ dataChange/installer/src/assembly/assemble_installer_zip.xml | 1 + dataChange/installer/src/assembly/assemble_mvnrepo_zip.xml | 1 + dmaap-listener/pom.xml | 2 ++ dmaap-listener/src/assembly/assemble_zip.xml | 1 + ueb-listener/pom.xml | 2 ++ ueb-listener/src/assembly/assemble_zip.xml | 1 + vnfapi/installer/pom.xml | 3 +++ vnfapi/installer/src/assembly/assemble_installer_zip.xml | 1 + vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml | 1 + vnftools/installer/pom.xml | 3 +++ vnftools/installer/src/assembly/assemble_installer_zip.xml | 1 + vnftools/installer/src/assembly/assemble_mvnrepo_zip.xml | 1 + 16 files changed, 26 insertions(+) diff --git a/asdcApi/installer/pom.xml b/asdcApi/installer/pom.xml index ced3c3da..f97c537c 100755 --- a/asdcApi/installer/pom.xml +++ b/asdcApi/installer/pom.xml @@ -47,6 +47,7 @@ maven-assembly-plugin + 2.6 maven-repo-zip @@ -60,6 +61,7 @@ src/assembly/assemble_mvnrepo_zip.xml + false @@ -74,6 +76,7 @@ src/assembly/assemble_installer_zip.xml + false diff --git a/asdcApi/installer/src/assembly/assemble_installer_zip.xml b/asdcApi/installer/src/assembly/assemble_installer_zip.xml index 728afca5..1bb0d089 100644 --- 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"> + installer_zip zip diff --git a/asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml b/asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml index b4d2d61a..49244028 100644 --- 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"> + mvnrepo_zip zip diff --git a/dataChange/installer/pom.xml b/dataChange/installer/pom.xml index 5b8462db..adc2d147 100755 --- a/dataChange/installer/pom.xml +++ b/dataChange/installer/pom.xml @@ -47,6 +47,7 @@ maven-assembly-plugin + 2.6 maven-repo-zip @@ -60,6 +61,7 @@ src/assembly/assemble_mvnrepo_zip.xml + false @@ -74,6 +76,7 @@ src/assembly/assemble_installer_zip.xml + false diff --git a/dataChange/installer/src/assembly/assemble_installer_zip.xml b/dataChange/installer/src/assembly/assemble_installer_zip.xml index 728afca5..1bb0d089 100644 --- 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"> + installer_zip zip diff --git a/dataChange/installer/src/assembly/assemble_mvnrepo_zip.xml b/dataChange/installer/src/assembly/assemble_mvnrepo_zip.xml index b4d2d61a..49244028 100644 --- 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"> + mvnrepo_zip zip diff --git a/dmaap-listener/pom.xml b/dmaap-listener/pom.xml index 58d23ae2..944ca86d 100755 --- a/dmaap-listener/pom.xml +++ b/dmaap-listener/pom.xml @@ -88,6 +88,7 @@ maven-assembly-plugin + 2.6 create-zip @@ -102,6 +103,7 @@ src/assembly/assemble_zip.xml + false diff --git a/dmaap-listener/src/assembly/assemble_zip.xml b/dmaap-listener/src/assembly/assemble_zip.xml index 4874d005..bd0cdd59 100644 --- 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"> + assemble_zip zip diff --git a/ueb-listener/pom.xml b/ueb-listener/pom.xml index eda454cf..23ebd531 100755 --- a/ueb-listener/pom.xml +++ b/ueb-listener/pom.xml @@ -101,6 +101,7 @@ maven-assembly-plugin + 2.6 create-zip @@ -115,6 +116,7 @@ src/assembly/assemble_zip.xml + false diff --git a/ueb-listener/src/assembly/assemble_zip.xml b/ueb-listener/src/assembly/assemble_zip.xml index 29e3b414..d18a0a4a 100644 --- 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"> + assemble_zip zip diff --git a/vnfapi/installer/pom.xml b/vnfapi/installer/pom.xml index 3fa0ac74..3fd98851 100755 --- a/vnfapi/installer/pom.xml +++ b/vnfapi/installer/pom.xml @@ -47,6 +47,7 @@ maven-assembly-plugin + 2.6 maven-repo-zip @@ -60,6 +61,7 @@ src/assembly/assemble_mvnrepo_zip.xml + false @@ -74,6 +76,7 @@ src/assembly/assemble_installer_zip.xml + false diff --git a/vnfapi/installer/src/assembly/assemble_installer_zip.xml b/vnfapi/installer/src/assembly/assemble_installer_zip.xml index c7fb0c16..13156fda 100644 --- 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"> + installer_zip zip diff --git a/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml b/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml index b37b3f19..162ce109 100644 --- 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"> + mvnrepo_zip zip diff --git a/vnftools/installer/pom.xml b/vnftools/installer/pom.xml index 9138fe0e..c3436f78 100755 --- a/vnftools/installer/pom.xml +++ b/vnftools/installer/pom.xml @@ -47,6 +47,7 @@ maven-assembly-plugin + 2.6 maven-repo-zip @@ -60,6 +61,7 @@ src/assembly/assemble_mvnrepo_zip.xml + false @@ -74,6 +76,7 @@ src/assembly/assemble_installer_zip.xml + false diff --git a/vnftools/installer/src/assembly/assemble_installer_zip.xml b/vnftools/installer/src/assembly/assemble_installer_zip.xml index 728afca5..1bb0d089 100644 --- 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"> + installer_zip zip diff --git a/vnftools/installer/src/assembly/assemble_mvnrepo_zip.xml b/vnftools/installer/src/assembly/assemble_mvnrepo_zip.xml index c14f8aed..6eb45540 100644 --- 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"> + mvnrepo_zip zip -- 2.16.6