summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2017-05-18 19:45:51 +0000
committerGerrit Code Review <gerrit@onap.org>2017-05-18 19:45:51 +0000
commitc258b60db9e29741b5231d4a3e5f75176c8416e3 (patch)
tree1b709ae9a5a328b22a61b0eba0502d8478f904c5
parent8c851b2e342f8888c8ad1cdff47b0117f165e3b2 (diff)
parenta5aae99cb537030f6d21fdaef5490ea82612884c (diff)
Merge "fix maven local build issue"
Former-commit-id: 16cb8a0af0c8bb1efd1e26f0b9aeb7e1fec36dc0
-rw-r--r--admportal/pom.xml2
-rw-r--r--admportal/src/assembly/assemble_zip.xml2
-rw-r--r--dgbuilder/pom.xml2
-rw-r--r--dgbuilder/src/assembly/assemble_zip.xml1
-rw-r--r--platform-logic/installer/pom.xml2
-rw-r--r--platform-logic/installer/src/assembly/assemble_zip.xml1
6 files changed, 9 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 9b93fe31..6e06a769 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>
diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml
index abd18531..7eb17848 100644
--- a/dgbuilder/pom.xml
+++ b/dgbuilder/pom.xml
@@ -68,6 +68,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.6</version>
<executions>
<execution>
<id>create-zip</id>
@@ -81,6 +82,7 @@
<descriptors>
<descriptor>src/assembly/assemble_zip.xml</descriptor>
</descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
</executions>
diff --git a/dgbuilder/src/assembly/assemble_zip.xml b/dgbuilder/src/assembly/assemble_zip.xml
index 8b65f500..b9943613 100644
--- a/dgbuilder/src/assembly/assemble_zip.xml
+++ b/dgbuilder/src/assembly/assemble_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>bin</id>
<formats>
<format>zip</format>
</formats>
diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml
index 837587a5..50998aa4 100644
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@ -48,6 +48,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.6</version>
<executions>
<execution>
<id>create-zip</id>
@@ -60,6 +61,7 @@
<descriptors>
<descriptor>src/assembly/assemble_zip.xml</descriptor>
</descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
diff --git a/platform-logic/installer/src/assembly/assemble_zip.xml b/platform-logic/installer/src/assembly/assemble_zip.xml
index 7f7e51ab..46a8b610 100644
--- a/platform-logic/installer/src/assembly/assemble_zip.xml
+++ b/platform-logic/installer/src/assembly/assemble_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>bin</id>
<formats>
<format>zip</format>
</formats>