diff options
author | Guo Ruijing <ruijing.guo@intel.com> | 2017-05-03 23:55:30 +0000 |
---|---|---|
committer | Guo Ruijing <ruijing.guo@intel.com> | 2017-05-04 19:08:53 +0000 |
commit | 116bb8574066cc0175a54371269707bc0e94e6d7 (patch) | |
tree | 7bf5ce1f44bdc0daa343cf646393d50e48deeed8 /vnfapi | |
parent | 0690dac45a1fd760453859e795453cca59f1451e (diff) |
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>
Diffstat (limited to 'vnfapi')
-rwxr-xr-x | vnfapi/installer/pom.xml | 3 | ||||
-rw-r--r-- | vnfapi/installer/src/assembly/assemble_installer_zip.xml | 1 | ||||
-rw-r--r-- | vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml | 1 |
3 files changed, 5 insertions, 0 deletions
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 @@ <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 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"> + <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 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"> + <id>mvnrepo_zip</id> <formats> <format>zip</format> </formats> |