aboutsummaryrefslogtreecommitdiffstats
path: root/admportal
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2017-05-07 19:08:00 +0000
committerGuo Ruijing <ruijing.guo@intel.com>2017-05-07 19:10:22 +0000
commita5aae99cb537030f6d21fdaef5490ea82612884c (patch)
tree9953d4833722f180b2ebb3d7d42f26f5d0ee45ae /admportal
parentd69660831c9dab695b1a89f8dcb7e522fbb25651 (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: I7b0b4ac61351704b4beab073dda5779d6b6e6152 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com> Former-commit-id: 6485eecefff83d76557aa8aaf33d273d5033d967
Diffstat (limited to 'admportal')
-rw-r--r--admportal/pom.xml2
-rw-r--r--admportal/src/assembly/assemble_zip.xml2
2 files changed, 3 insertions, 1 deletions
diff --git a/admportal/pom.xml b/admportal/pom.xml
index 5e9cad66..41070864 100644
--- a/admportal/pom.xml
+++ b/admportal/pom.xml
@@ -46,6 +46,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.6</version>
<executions>
<execution>
<id>create-zip</id>
@@ -60,6 +61,7 @@
<descriptor>src/assembly/assemble_zip.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
+ <appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
</executions>
diff --git a/admportal/src/assembly/assemble_zip.xml b/admportal/src/assembly/assemble_zip.xml
index 736c15cc..de4aae86 100644
--- a/admportal/src/assembly/assemble_zip.xml
+++ b/admportal/src/assembly/assemble_zip.xml
@@ -25,7 +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>bin</id>
+ <id>bin</id>
<formats>
<format>zip</format>
</formats>