update assemble and rpmbuild because config/*.* remove script to dolphinscheduler-server/src/main/resources (#1609)

5 years ago · 7f27c8a86e
3 changed files with 3 additions and 3 deletions
--- a/dolphinscheduler-dist/pom.xml
+++ b/dolphinscheduler-dist/pom.xml
@ -271,6 +271,7 @@
                                                <include>**/*.properties</include>
                                                <include>**/*.xml</include>
                                                <include>**/*.json</include>
+                                                <include>config/*.*</include>
                                            </includes>
                                        </source>

@ -279,7 +280,6 @@
                                                ${basedir}/../script
                                            </location>
                                            <includes>
-                                                <include>config/*.*</include>
                                                <include>env/*.*</include>
                                            </includes>
                                        </source>
--- a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-binary.xml
+++ b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-binary.xml
@ -94,6 +94,7 @@
 				<include>**/*.properties</include>
 				<include>**/*.xml</include>
 				<include>**/*.json</include>
+				<include>config/*.*</include>
 			</includes>
 			<outputDirectory>conf</outputDirectory>
 		</fileSet>
@ -162,7 +163,6 @@
 		<fileSet>
 			<directory>${basedir}/../script</directory>
 			<includes>
-				<include>config/*.*</include>
 				<include>env/*.*</include>
 			</includes>
 			<outputDirectory>./conf</outputDirectory>
--- a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-nginx.xml
+++ b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-nginx.xml
@ -94,6 +94,7 @@
 				<include>**/*.properties</include>
 				<include>**/*.xml</include>
 				<include>**/*.json</include>
+				<include>config/*.*</include>
 			</includes>
 			<outputDirectory>conf</outputDirectory>
 		</fileSet>
@ -185,7 +186,6 @@
 		<fileSet>
 			<directory>${basedir}/../script</directory>
 			<includes>
-				<include>config/*.*</include>
 				<include>env/*.*</include>
 			</includes>
 			<outputDirectory>./conf</outputDirectory>