summaryrefslogtreecommitdiffstats
path: root/asdcApi
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2017-05-03 23:55:30 +0000
committerGuo Ruijing <ruijing.guo@intel.com>2017-05-04 19:08:53 +0000
commit116bb8574066cc0175a54371269707bc0e94e6d7 (patch)
tree7bf5ce1f44bdc0daa343cf646393d50e48deeed8 /asdcApi
parent0690dac45a1fd760453859e795453cca59f1451e (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 'asdcApi')
-rwxr-xr-xasdcApi/installer/pom.xml3
-rw-r--r--asdcApi/installer/src/assembly/assemble_installer_zip.xml1
-rw-r--r--asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml1
3 files changed, 5 insertions, 0 deletions
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 @@
<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/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">
+ <id>installer_zip</id>
<formats>
<format>zip</format>
</formats>
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">
+ <id>mvnrepo_zip</id>
<formats>
<format>zip</format>
</formats>