From ccd987f90c10c6cef6df912c3256818173add8e8 Mon Sep 17 00:00:00 2001
From: FlechazoW <tianzhu4680@protonmail.com>
Date: Tue, 18 Oct 2022 12:00:48 +0800
Subject: [PATCH] [Improve][Assembly] Adjust the output and package of
 assembly.

---
 .gitignore                                    |  1 +
 chunjun-assembly/pom.xml                      |  1 +
 .../src/main/assembly/assembly.xml            | 51 ++++++++-----------
 3 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index b884cd4a04..5e862f8aa5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,4 @@ chunjun-dist/
 /website/public/page-data/
 
 chunjun-dev/data/**
+output/*
diff --git a/chunjun-assembly/pom.xml b/chunjun-assembly/pom.xml
index 8d1e96dff0..6b58bcf0ce 100644
--- a/chunjun-assembly/pom.xml
+++ b/chunjun-assembly/pom.xml
@@ -55,6 +55,7 @@
 							<descriptors>
 								<descriptor>src/main/assembly/assembly.xml</descriptor>
 							</descriptors>
+							<outputDirectory>../output</outputDirectory>
 						</configuration>
 					</execution>
 				</executions>
diff --git a/chunjun-assembly/src/main/assembly/assembly.xml b/chunjun-assembly/src/main/assembly/assembly.xml
index 4869f86da5..60a1ec172a 100644
--- a/chunjun-assembly/src/main/assembly/assembly.xml
+++ b/chunjun-assembly/src/main/assembly/assembly.xml
@@ -1,24 +1,17 @@
 <assembly>
-    <id>${project.version}</id>
-    <formats>
-        <format>tar.gz</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
+	<id>${project.version}</id>
+	<formats>
+		<format>tar.gz</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
 
-    <fileSets>
-        <fileSet>
-            <directory>${project.parent.basedir}</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>README*</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>
-                ${project.parent.basedir}/bin
-            </directory>
-            <outputDirectory>bin</outputDirectory>
-        </fileSet>
+	<fileSets>
+		<fileSet>
+			<directory>
+				${project.parent.basedir}/bin
+			</directory>
+			<outputDirectory>bin</outputDirectory>
+		</fileSet>
 		<fileSet>
 			<directory>
 				${project.parent.basedir}/chunjun-dist
@@ -40,15 +33,15 @@
 			</directory>
 			<outputDirectory>lib</outputDirectory>
 		</fileSet>
-    </fileSets>
+	</fileSets>
 
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>lib</outputDirectory>
-            <useTransitiveDependencies>true</useTransitiveDependencies>
-            <unpack>false</unpack>
-            <scope>runtime</scope>
-            <useProjectArtifact>false</useProjectArtifact>
-        </dependencySet>
-    </dependencySets>
+	<dependencySets>
+		<dependencySet>
+			<outputDirectory>lib</outputDirectory>
+			<useTransitiveDependencies>true</useTransitiveDependencies>
+			<unpack>false</unpack>
+			<scope>package</scope>
+			<useProjectArtifact>false</useProjectArtifact>
+		</dependencySet>
+	</dependencySets>
 </assembly>