From ec94d5fb3dc51e68e02c1261397654de8084ba1a Mon Sep 17 00:00:00 2001 From: Guo Ruijing Date: Sun, 7 May 2017 19:27:27 +0000 Subject: 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: Id3e0d959a12ceb8b67a139a2cb22850864666354 Signed-off-by: Guo Ruijing --- aai-service/installer/pom.xml | 3 +++ aai-service/installer/src/assembly/assemble_installer_zip.xml | 1 + aai-service/installer/src/assembly/assemble_mvnrepo_zip.xml | 1 + mdsal-resource/installer/pom.xml | 3 +++ mdsal-resource/installer/src/assembly/assemble_installer_zip.xml | 1 + mdsal-resource/installer/src/assembly/assemble_mvnrepo_zip.xml | 1 + resource-assignment/installer/pom.xml | 3 +++ resource-assignment/installer/src/assembly/assemble_installer_zip.xml | 1 + resource-assignment/installer/src/assembly/assemble_mvnrepo_zip.xml | 1 + sql-resource/installer/pom.xml | 3 +++ sql-resource/installer/src/assembly/assemble_installer_zip.xml | 1 + sql-resource/installer/src/assembly/assemble_mvnrepo_zip.xml | 1 + 12 files changed, 20 insertions(+) diff --git a/aai-service/installer/pom.xml b/aai-service/installer/pom.xml index 73f5a74..bc7cfd6 100755 --- a/aai-service/installer/pom.xml +++ b/aai-service/installer/pom.xml @@ -51,6 +51,7 @@ maven-assembly-plugin + 2.6 maven-repo-zip @@ -64,6 +65,7 @@ src/assembly/assemble_mvnrepo_zip.xml + false @@ -78,6 +80,7 @@ src/assembly/assemble_installer_zip.xml + false diff --git a/aai-service/installer/src/assembly/assemble_installer_zip.xml b/aai-service/installer/src/assembly/assemble_installer_zip.xml index 728afca..1bb0d08 100644 --- a/aai-service/installer/src/assembly/assemble_installer_zip.xml +++ b/aai-service/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/aai-service/installer/src/assembly/assemble_mvnrepo_zip.xml b/aai-service/installer/src/assembly/assemble_mvnrepo_zip.xml index c14f8ae..6eb4554 100644 --- a/aai-service/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/aai-service/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/mdsal-resource/installer/pom.xml b/mdsal-resource/installer/pom.xml index 0f591ac..188146d 100755 --- a/mdsal-resource/installer/pom.xml +++ b/mdsal-resource/installer/pom.xml @@ -45,6 +45,7 @@ maven-assembly-plugin + 2.6 maven-repo-zip @@ -58,6 +59,7 @@ src/assembly/assemble_mvnrepo_zip.xml + false @@ -72,6 +74,7 @@ src/assembly/assemble_installer_zip.xml + false diff --git a/mdsal-resource/installer/src/assembly/assemble_installer_zip.xml b/mdsal-resource/installer/src/assembly/assemble_installer_zip.xml index 728afca..1bb0d08 100644 --- a/mdsal-resource/installer/src/assembly/assemble_installer_zip.xml +++ b/mdsal-resource/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/mdsal-resource/installer/src/assembly/assemble_mvnrepo_zip.xml b/mdsal-resource/installer/src/assembly/assemble_mvnrepo_zip.xml index c14f8ae..6eb4554 100644 --- a/mdsal-resource/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/mdsal-resource/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/resource-assignment/installer/pom.xml b/resource-assignment/installer/pom.xml index 2868626..17dc896 100755 --- a/resource-assignment/installer/pom.xml +++ b/resource-assignment/installer/pom.xml @@ -45,6 +45,7 @@ maven-assembly-plugin + 2.6 maven-repo-zip @@ -58,6 +59,7 @@ src/assembly/assemble_mvnrepo_zip.xml + false @@ -72,6 +74,7 @@ src/assembly/assemble_installer_zip.xml + false diff --git a/resource-assignment/installer/src/assembly/assemble_installer_zip.xml b/resource-assignment/installer/src/assembly/assemble_installer_zip.xml index 728afca..1bb0d08 100644 --- a/resource-assignment/installer/src/assembly/assemble_installer_zip.xml +++ b/resource-assignment/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/resource-assignment/installer/src/assembly/assemble_mvnrepo_zip.xml b/resource-assignment/installer/src/assembly/assemble_mvnrepo_zip.xml index c14f8ae..6eb4554 100644 --- a/resource-assignment/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/resource-assignment/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/sql-resource/installer/pom.xml b/sql-resource/installer/pom.xml index cbca27b..5072d83 100755 --- a/sql-resource/installer/pom.xml +++ b/sql-resource/installer/pom.xml @@ -45,6 +45,7 @@ maven-assembly-plugin + 2.6 maven-repo-zip @@ -58,6 +59,7 @@ src/assembly/assemble_mvnrepo_zip.xml + false @@ -72,6 +74,7 @@ src/assembly/assemble_installer_zip.xml + false diff --git a/sql-resource/installer/src/assembly/assemble_installer_zip.xml b/sql-resource/installer/src/assembly/assemble_installer_zip.xml index 728afca..1bb0d08 100644 --- a/sql-resource/installer/src/assembly/assemble_installer_zip.xml +++ b/sql-resource/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/sql-resource/installer/src/assembly/assemble_mvnrepo_zip.xml b/sql-resource/installer/src/assembly/assemble_mvnrepo_zip.xml index c14f8ae..6eb4554 100644 --- a/sql-resource/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/sql-resource/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 -- cgit 1.2.3-korg