Browse Source

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>
pull/3/MERGE
liuhuijuan 4 years ago committed by lenboo
parent
commit
24134f9271
  1. 22
      dolphinscheduler-dist/src/main/assembly/dolphinscheduler-nginx.xml

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

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

Loading…
Cancel
Save