1. The publish package name add system type

2. Parameter tasks is deprecated, use target instead

Change-Id: Ic7e23133ed919161e0fd8b9d980fe9064bed8c52
Issue-id: TOSCA-65
Signed-off-by: huangjian <huang.jian12@zte.com.cn>

diff --git a/catalog-core/distribution/catalog-all/pom.xml b/catalog-core/distribution/catalog-all/pom.xml
index 315ba12..c25403c 100644 (file)
--- a/catalog-core/distribution/catalog-all/pom.xml
+++ b/catalog-core/distribution/catalog-all/pom.xml
@@ -186,25 +186,19 @@
                         </goals>
                         <configuration>
                             <target name="distribution">
-                                <tar destfile="${version.output}/${packagename}-${project.version}.tar.gz" longfile="posix" compression="gzip">
+                                <tar destfile="${version.output}/${packagename}-${project.version}-linux64.tar.gz" longfile="posix" compression="gzip">
                                     <tarfileset dir="target/assembly/linux64" filemode="0644" dirmode="0755">
                                         <exclude name="**/*.sh"/>
-                                        <exclude name="openresty/nginx/sbin/nginx"/>
-                                        <exclude name="redis/redis-*"/>
                                     </tarfileset>
                                     <tarfileset dir="target/assembly/linux64" filemode="0755" dirmode="0755">
                                         <include name="**/*.sh"/>
-                                        <include name="openresty/nginx/sbin/nginx"/>
-                                        <include name="redis/redis-*"/>
                                     </tarfileset>
                                 </tar>
-                                <attachartifact file="${version.output}/${packagename}-${project.version}.tar.gz" classifier="linux64" type="tar.gz"/>
-
-
-                                <zip destfile="${version.output}/${packagename}-${project.version}.zip" update="true">
+                                <attachartifact file="${version.output}/${packagename}-${project.version}-linux64.tar.gz" classifier="linux64" type="tar.gz"/>
+                                <zip destfile="${version.output}/${packagename}-${project.version}-win64.zip" update="true">
                                     <zipfileset dir="target/assembly/win64" includes="**"/>
                                 </zip>
-                                <attachartifact file="${version.output}/${packagename}-${project.version}.zip" classifier="win64" type="zip"/>
+                                <attachartifact file="${version.output}/${packagename}-${project.version}-win64.zip" classifier="win64" type="zip"/>
                             </target>
                         </configuration>
                     </execution>

diff --git a/catalog-core/distribution/catalog-standalone/pom.xml b/catalog-core/distribution/catalog-standalone/pom.xml
index c873d40..6f4b787 100644 (file)
--- a/catalog-core/distribution/catalog-standalone/pom.xml
+++ b/catalog-core/distribution/catalog-standalone/pom.xml
@@ -136,8 +136,8 @@
                             <goal>run</goal>
                         </goals>
                         <configuration>
-                            <tasks name="distribution">
-                                <tar destfile="${version.output}/${packagename}-${project.version}.tar.gz" longfile="posix" compression="gzip">
+                            <target name="distribution">
+                                <tar destfile="${version.output}/${packagename}-${project.version}-linux64.tar.gz" longfile="posix" compression="gzip">
                                     <tarfileset dir="target/assembly/linux64" filemode="0644" dirmode="0755">
                                         <exclude name="**/*.sh"/>
                                     </tarfileset>
@@ -145,12 +145,12 @@
                                         <include name="**/*.sh"/>
                                     </tarfileset>
                                 </tar>
-                                <attachartifact file="${version.output}/${packagename}-${project.version}.tar.gz" classifier="linux64" type="tar.gz"/>
-                                <zip destfile="${version.output}/${packagename}-${project.version}.zip" update="true">
+                                <attachartifact file="${version.output}/${packagename}-${project.version}-linux64.tar.gz" classifier="linux64" type="tar.gz"/>
+                                <zip destfile="${version.output}/${packagename}-${project.version}-win64.zip" update="true">
                                     <zipfileset dir="target/assembly/win64" includes="**"/>
                                 </zip>
-                                <attachartifact file="${version.output}/${packagename}-${project.version}.zip" classifier="win64" type="zip"/>
-                            </tasks>
+                                <attachartifact file="${version.output}/${packagename}-${project.version}-win64.zip" classifier="win64" type="zip"/>
+                            </target>
                         </configuration>
                     </execution>
                 </executions>