From 7e291b8ebf625519d44c240cbee83521317d52ee Mon Sep 17 00:00:00 2001
From: liboNet <libo.zhu@intel.com>
Date: Sat, 23 Mar 2019 03:10:37 +0800
Subject: [PATCH] rename the assembly setting

To fix the packing assembly  issue.
there should be a zip file generated

Change-Id: I82bc9fc87be1bcf8b87e75e9f8f5870efa9ea7cf
Issue-ID: MULTICLOUD-546
Signed-off-by: liboNet <libo.zhu@intel.com>
---
 artifactbroker/packages/pom.xml                             | 13 +++++++------
 .../packages/src/main/package/{tarball => }/assembly.xml    |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)
 rename artifactbroker/packages/src/main/package/{tarball => }/assembly.xml (99%)

diff --git a/artifactbroker/packages/pom.xml b/artifactbroker/packages/pom.xml
index a90cd49..29548b1 100644
--- a/artifactbroker/packages/pom.xml
+++ b/artifactbroker/packages/pom.xml
@@ -45,6 +45,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <descriptors>
+                        <descriptor>src/main/package/assembly.xml</descriptor>
+                    </descriptors>
+                    <finalName>${project.artifactId}-${project.version}</finalName>
+                </configuration>
                 <executions>
                     <execution>
                         <id>generate-complete-tar</id>
@@ -52,12 +59,6 @@
                         <goals>
                             <goal>single</goal>
                         </goals>
-                        <configuration>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <descriptors>
-                                <descriptor>src/main/package/tarball/assembly.xml</descriptor>
-                            </descriptors>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
diff --git a/artifactbroker/packages/src/main/package/tarball/assembly.xml b/artifactbroker/packages/src/main/package/assembly.xml
similarity index 99%
rename from artifactbroker/packages/src/main/package/tarball/assembly.xml
rename to artifactbroker/packages/src/main/package/assembly.xml
index 0c28db1..1b85eaa 100644
--- a/artifactbroker/packages/src/main/package/tarball/assembly.xml
+++ b/artifactbroker/packages/src/main/package/assembly.xml
@@ -19,7 +19,7 @@
 -->
 
 <assembly>
-    <id>tarball</id>
+    <id>zip</id>
     <formats>
         <format>zip</format>
     </formats>
-- 
2.16.6