From 6dffa97fdd7007fc19a90617679d9511ce83461b Mon Sep 17 00:00:00 2001
From: liuhuijuan <67306399+liuhuijuan-bx@users.noreply.github.com>
Date: Thu, 25 Jun 2020 14:50:31 +0800
Subject: [PATCH] fix release for nginx not package config files, eg:
 zookeeper.properties (#3041)

* fix release for nginx bug

* add state (#3040)

Co-authored-by: mzjnumber1@163.com <mzjnumber1@163.com>

* [BUG_FIX]fix  multi-threaded tests error. (#3044)

* fix  test mock error

* fix  test mock error

Co-authored-by: muzhongjiang <mu_zhongjiang@163.com>
Co-authored-by: mzjnumber1@163.com <mzjnumber1@163.com>
Co-authored-by: CalvinKirs <acm_master@163.com>
---
 .../main/assembly/dolphinscheduler-nginx.xml  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-nginx.xml b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-nginx.xml
index f4e403e4b4..f41151cd09 100644
--- a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-nginx.xml
+++ b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-nginx.xml
@@ -98,25 +98,24 @@
 			</includes>
 			<outputDirectory>conf</outputDirectory>
 		</fileSet>
+
+
 		<fileSet>
-			<directory>${basedir}/../dolphinscheduler-common/src/main/resources</directory>
+			<directory>${basedir}/../dolphinscheduler-dao/src/main/resources</directory>
 			<includes>
 				<include>**/*.properties</include>
 				<include>**/*.xml</include>
 				<include>**/*.json</include>
+				<include>**/*.yml</include>
 			</includes>
 			<outputDirectory>conf</outputDirectory>
 		</fileSet>
+		<!--server end-->
+
+
+		<!--service end-->
 		<fileSet>
-			<directory>${basedir}/../dolphinscheduler-common/src/main/resources/bin</directory>
-			<includes>
-				<include>*.*</include>
-			</includes>
-			<directoryMode>755</directoryMode>
-			<outputDirectory>bin</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../dolphinscheduler-dao/src/main/resources</directory>
+			<directory>${basedir}/../dolphinscheduler-service/src/main/resources</directory>
 			<includes>
 				<include>**/*.properties</include>
 				<include>**/*.xml</include>
@@ -125,7 +124,8 @@
 			</includes>
 			<outputDirectory>conf</outputDirectory>
 		</fileSet>
-		<!--server end-->
+		<!--service end-->
+
 
 		<fileSet>
 			<directory>${basedir}/../dolphinscheduler-server/target/dolphinscheduler-server-${project.version}</directory>