Unverified Commit 6dffa97f authored by liuhuijuan's avatar liuhuijuan Committed by GitHub
Browse files

fix release for nginx not package config files, eg: zookeeper.properties (#3041) 



* fix release for nginx bug

* add state (#3040)

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

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

* fix  test mock error

* fix  test mock error

Co-authored-by: default avatarmuzhongjiang <mu_zhongjiang@163.com>
Co-authored-by: default avatarmzjnumber1@163.com <mzjnumber1@163.com>
Co-authored-by: default avatarCalvinKirs <acm_master@163.com>
parent ad28c651

dolphinscheduler-dist/src/main/assembly/dolphinscheduler-nginx.xml

+11 −11
Original line number Diff line number Diff line
@@ -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>