From d2cb8427bbde754cc6b37ddffabd6b21ffd2e756 Mon Sep 17 00:00:00 2001
From: heavyrian2012 <heavyrain.lee@wildfirehat.cn>
Date: Fri, 19 Aug 2022 08:05:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=8B=E8=BD=BDzip?=
 =?UTF-8?q?=E5=8C=85=E7=BC=96=E8=AF=91=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 distribution/pom.xml                          |  2 +-
 distribution/src/main/assembly/assembly.xml   | 32 ++++---------------
 .../src/main/{resources => files}/README.txt  |  0
 3 files changed, 7 insertions(+), 27 deletions(-)
 rename distribution/src/main/{resources => files}/README.txt (100%)

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 57fca776..659ffd85 100755
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -51,7 +51,7 @@
                     <!--指定"git.properties"文件的存放路径(相对于${project.basedir}的一个路径);-->
                     <generateGitPropertiesFilename>src/main/resources/git.properties</generateGitPropertiesFilename>
                     <!--".git"文件夹未找到时,构建是否失败;若设置true,则构建失败;若设置false,则跳过执行该目标;默认值:true;-->
-                    <failOnNoGitDirectory>true</failOnNoGitDirectory>
+                    <failOnNoGitDirectory>false</failOnNoGitDirectory>
 
                     <!--git描述配置,可选;由JGit提供实现;-->
                     <gitDescribe>
diff --git a/distribution/src/main/assembly/assembly.xml b/distribution/src/main/assembly/assembly.xml
index d5a8bbbb..19c2c66d 100755
--- a/distribution/src/main/assembly/assembly.xml
+++ b/distribution/src/main/assembly/assembly.xml
@@ -24,6 +24,11 @@
             <directory>../broker/config/i18n/</directory>
             <outputDirectory>/config/i18n</outputDirectory>
         </fileSet>
+
+        <fileSet>
+            <directory>src/main/resources/</directory>
+            <outputDirectory>config/</outputDirectory>
+        </fileSet>
     </fileSets>
 
     <files>
@@ -40,32 +45,7 @@
         </file>
 
         <file>
-            <source>src/main/resources/log4j2.xml</source>
-            <outputDirectory>config/</outputDirectory>
-            <destName>log4j2.xml</destName>
-        </file>
-
-        <file>
-            <source>src/main/resources/wildfirechat.conf</source>
-            <outputDirectory>config/</outputDirectory>
-        </file>
-
-        <file>
-            <source>src/main/resources/hazelcast.xml</source>
-            <outputDirectory>config/</outputDirectory>
-        </file>
-        <file>
-            <source>src/main/resources/c3p0-config.xml</source>
-            <outputDirectory>config/</outputDirectory>
-        </file>
-
-        <file>
-            <source>src/main/resources/README.txt</source>
-        </file>
-
-        <file>
-            <source>src/main/resources/git.properties</source>
-            <outputDirectory>config/</outputDirectory>
+            <source>src/main/files/README.txt</source>
         </file>
 
         <file>
diff --git a/distribution/src/main/resources/README.txt b/distribution/src/main/files/README.txt
similarity index 100%
rename from distribution/src/main/resources/README.txt
rename to distribution/src/main/files/README.txt