diff options
| author |   Dan Timoney <dtimoney@att.com> | 2017-05-18 19:45:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-05-18 19:45:26 +0000 |
| commit | 910d54b305de984d70a078b73c85b9ec1152fcf1 (patch) | |
| tree | 5543286333fc6aa37718ac2fad1c80dd64242c3a /vnfapi | |
| parent | e0f2893f9d01bc107b1d31eb65c053a6aa7e406f (diff) | |
| parent | 116bb8574066cc0175a54371269707bc0e94e6d7 (diff) | |
Merge "fix maven local build issue"
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> |