This is an automated email from the ASF dual-hosted git repository. leonbao pushed a commit to branch 1.3.1-release in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 24134f9271af8e01fcd2667450a15a40faf02a3f Author: liuhuijuan <67306399+liuhuijuan...@users.noreply.github.com> AuthorDate: Thu Jun 25 14:50:31 2020 +0800 fix release for nginx not package config files, eg: zookeeper.properties (#3041) * fix release for nginx bug * add state (#3040) Co-authored-by: mzjnumb...@163.com <mzjnumb...@163.com> * [BUG_FIX]fix multi-threaded tests error. (#3044) * fix test mock error * fix test mock error Co-authored-by: muzhongjiang <mu_zhongji...@163.com> Co-authored-by: mzjnumb...@163.com <mzjnumb...@163.com> Co-authored-by: CalvinKirs <acm_mas...@163.com> --- .../src/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 f4e403e..f41151c 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>