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: 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/assembly.xml         | 70 ++++++++++++++++++++++
 .../packages/src/main/package/tarball/assembly.xml | 70 ----------------------
 3 files changed, 77 insertions(+), 76 deletions(-)
 create mode 100644 artifactbroker/packages/src/main/package/assembly.xml
 delete mode 100644 artifactbroker/packages/src/main/package/tarball/assembly.xml

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/assembly.xml b/artifactbroker/packages/src/main/package/assembly.xml
new file mode 100644
index 0000000..1b85eaa
--- /dev/null
+++ b/artifactbroker/packages/src/main/package/assembly.xml
@@ -0,0 +1,70 @@
+<!--
+  ============LICENSE_START=======================================================
+   Copyright (C) 2018 Ericsson. All rights reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+
+<assembly>
+    <id>zip</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <useProjectArtifact>true</useProjectArtifact>
+            <outputDirectory>/lib</outputDirectory>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <includes>
+                <include>*:jar</include>
+            </includes>
+        </dependencySet>
+    </dependencySets>
+    <fileSets>
+        <fileSet>
+            <directory>${project.basedir}/src/main/resources</directory>
+            <includes>
+                <include>policyLogger.properties</include>
+            </includes>
+            <outputDirectory>/bin/config</outputDirectory>
+            <lineEnding>unix</lineEnding>
+        </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/src/main/resources/etc
+            </directory>
+            <includes>
+                <include>*.json</include>
+                <include>*.xml</include>
+            </includes>
+            <outputDirectory>/etc</outputDirectory>
+            <lineEnding>unix</lineEnding>
+            <excludes>
+                <exclude>*.formatted</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/src/main/resources/etc/ssl
+            </directory>
+            <includes>
+                <include>policy*</include>
+            </includes>
+            <outputDirectory>/etc/ssl</outputDirectory>
+            <lineEnding>keep</lineEnding>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/artifactbroker/packages/src/main/package/tarball/assembly.xml b/artifactbroker/packages/src/main/package/tarball/assembly.xml
deleted file mode 100644
index 0c28db1..0000000
--- a/artifactbroker/packages/src/main/package/tarball/assembly.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2018 Ericsson. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<assembly>
-    <id>tarball</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <dependencySets>
-        <dependencySet>
-            <useProjectArtifact>true</useProjectArtifact>
-            <outputDirectory>/lib</outputDirectory>
-            <unpack>false</unpack>
-            <scope>runtime</scope>
-            <includes>
-                <include>*:jar</include>
-            </includes>
-        </dependencySet>
-    </dependencySets>
-    <fileSets>
-        <fileSet>
-            <directory>${project.basedir}/src/main/resources</directory>
-            <includes>
-                <include>policyLogger.properties</include>
-            </includes>
-            <outputDirectory>/bin/config</outputDirectory>
-            <lineEnding>unix</lineEnding>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/src/main/resources/etc
-            </directory>
-            <includes>
-                <include>*.json</include>
-                <include>*.xml</include>
-            </includes>
-            <outputDirectory>/etc</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <excludes>
-                <exclude>*.formatted</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/src/main/resources/etc/ssl
-            </directory>
-            <includes>
-                <include>policy*</include>
-            </includes>
-            <outputDirectory>/etc/ssl</outputDirectory>
-            <lineEnding>keep</lineEnding>
-        </fileSet>
-    </fileSets>
-</assembly>
-- 
cgit 1.2.3-korg