From 7f27c8a86e8d10f30875a74edf0854c68283c873 Mon Sep 17 00:00:00 2001
From: lgcareer <18610854716@163.com>
Date: Fri, 27 Dec 2019 17:05:28 +0800
Subject: [PATCH] update assemble and rpmbuild because config/*.* remove script
 to dolphinscheduler-server/src/main/resources (#1609)

---
 dolphinscheduler-dist/pom.xml                                   | 2 +-
 .../src/main/assembly/dolphinscheduler-binary.xml               | 2 +-
 .../src/main/assembly/dolphinscheduler-nginx.xml                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dolphinscheduler-dist/pom.xml b/dolphinscheduler-dist/pom.xml
index 2a7553e3a3..b43daff41b 100644
--- 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>
diff --git a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-binary.xml b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-binary.xml
index 2bf109698b..b4326c6795 100644
--- 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>
diff --git a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-nginx.xml b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-nginx.xml
index ebe5b2cb3f..f4e403e4b4 100644
--- 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>