Merge branch 'master' into fix-script

apache · Dec 1, 2022 · e948fe9 · e948fe9
2 parents 61ab774 + 927b673
commit e948fe9
Showing 1 changed file with 7 additions and 18 deletions.
diff --git a/hugegraph-dist/pom.xml b/hugegraph-dist/pom.xml
@@ -30,8 +30,7 @@
 
     <properties>
         <assembly.dir>${project.basedir}/src/assembly</assembly.dir>
-        <assembly.descriptor.dir>${assembly.dir}/descriptor
-        </assembly.descriptor.dir>
+        <assembly.descriptor.dir>${assembly.dir}/descriptor</assembly.descriptor.dir>
         <assembly.static.dir>${assembly.dir}/static</assembly.static.dir>
     </properties>
 
@@ -178,22 +177,12 @@
                             <goal>run</goal>
                         </goals>
                         <configuration>
-                            <tasks>
-                                <echo file="${top.level.dir}/dist.sh">
-                                    tar -zcvf \
-                                    ${top.level.dir}/${final.name}.tar.gz \
-                                    ${final.name} || exit 1
-                                    rm -f ${top.level.dir}/dist.sh
-                                    echo
-                                    echo "HugeGraph dist tar.gz available at:
-                                    ${top.level.dir}/${final.name}.tar.gz"
-                                    echo
-                                </echo>
-                                <exec executable="${shell-executable}"
-                                      dir="${top.level.dir}" failonerror="true">
-                                    <arg line="./dist.sh"/>
-                                </exec>
-                            </tasks>
+                            <target>
+                                <tar destfile="${top.level.dir}/${final.name}.tar.gz" 
+                                     basedir="${top.level.dir}"  
+                                     includes="${final.name}/*"
+                                     compression="gzip"/>
+                            </target>
                         </configuration>
                     </execution>
                 </executions>