aboutsummaryrefslogtreecommitdiffstats
path: root/restapi-call-node
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2017-05-07 20:16:41 +0000
committerGuo Ruijing <ruijing.guo@intel.com>2017-05-07 20:19:42 +0000
commit1085e3c7a76889dda96a9d86af3d1a620587e97f (patch)
tree9179e30fd9128b476378daa1358a6a4ba0084ab1 /restapi-call-node
parent4f070a81d0fb89b1e74776aac7366b7d628db0a4 (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: Ic14c86c5164157c312df5ef85272f123fde9217d Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Diffstat (limited to 'restapi-call-node')
-rwxr-xr-xrestapi-call-node/installer/pom.xml3
-rw-r--r--restapi-call-node/installer/src/assembly/assemble_installer_zip.xml1
-rw-r--r--restapi-call-node/installer/src/assembly/assemble_mvnrepo_zip.xml1
3 files changed, 5 insertions, 0 deletions
diff --git a/restapi-call-node/installer/pom.xml b/restapi-call-node/installer/pom.xml
index d168694..a1578ff 100755
--- a/restapi-call-node/installer/pom.xml
+++ b/restapi-call-node/installer/pom.xml
@@ -46,6 +46,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.6</version>
<executions>
<execution>
<id>maven-repo-zip</id>
@@ -59,6 +60,7 @@
<descriptors>
<descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
</descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
<execution>
@@ -73,6 +75,7 @@
<descriptors>
<descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
</descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
</executions>
diff --git a/restapi-call-node/installer/src/assembly/assemble_installer_zip.xml b/restapi-call-node/installer/src/assembly/assemble_installer_zip.xml
index f613d33..10b53b9 100644
--- a/restapi-call-node/installer/src/assembly/assemble_installer_zip.xml
+++ b/restapi-call-node/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/restapi-call-node/installer/src/assembly/assemble_mvnrepo_zip.xml b/restapi-call-node/installer/src/assembly/assemble_mvnrepo_zip.xml
index 27df272..6542ce0 100644
--- a/restapi-call-node/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/restapi-call-node/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>