merge frontend and backend tar into one binary tar (#1511)

dolphinscheduler-dist/dolphinscheduler-backend/pom.xml

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>dolphinscheduler-dist</artifactId>
-        <groupId>org.apache.dolphinscheduler</groupId>
-        <version>1.2.1-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>dolphinscheduler-backend</artifactId>
-    <name>${project.artifactId}</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.dolphinscheduler</groupId>
-            <artifactId>dolphinscheduler-server</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.dolphinscheduler</groupId>
-            <artifactId>dolphinscheduler-api</artifactId>
-        </dependency>
-
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>dolphinscheduler-backend-bin</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/dolphinscheduler-binary-backend.xml</descriptor>
-                                    </descriptors>
-                                    <appendAssemblyId>true</appendAssemblyId>
-                                </configuration>
-                            </execution>
-
-
-                        </executions>
-                    </plugin>
-
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>

dolphinscheduler-dist/dolphinscheduler-front/pom.xml

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>dolphinscheduler-dist</artifactId>
-        <groupId>org.apache.dolphinscheduler</groupId>
-        <version>1.2.1-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dolphinscheduler-front</artifactId>
-    <name>${project.artifactId}</name>
-
-    <profiles>
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>dolphinscheduler-front-bin</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/dolphinscheduler-binary-front.xml</descriptor>
-                                    </descriptors>
-                                    <appendAssemblyId>true</appendAssemblyId>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>

dolphinscheduler-dist/dolphinscheduler-front/src/main/assembly/dolphinscheduler-binary-front.xml

@@ -1,71 +0,0 @@
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<assembly
-        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-    <id>dolphinscheduler-front-bin</id>
-    <formats>
-        <format>tar.gz</format>
-    </formats>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>${project.build.finalName}-dolphinscheduler-front-bin</baseDirectory>
-
-    <fileSets>
-        <fileSet>
-            <directory>${basedir}/../../dolphinscheduler-ui/dist</directory>
-            <includes>
-                <include>**/*.*</include>
-            </includes>
-            <outputDirectory>./dist</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>${basedir}/../../dolphinscheduler-ui</directory>
-            <includes>
-                <include>install-dolphinscheduler-ui.sh</include>
-            </includes>
-            <outputDirectory>.</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>${basedir}/../release-docs</directory>
-            <includes>
-                <include>./*</include>
-            </includes>
-            <outputDirectory>.</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>${basedir}/../release-docs/licenses/ui-licenses</directory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-            <outputDirectory>./licenses</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>${basedir}/../.././</directory>
-            <includes>
-                <include>DISCLAIMER</include>
-            </includes>
-            <outputDirectory>.</outputDirectory>
-        </fileSet>
-
-    </fileSets>
-</assembly>

dolphinscheduler-dist/dolphinscheduler-src/pom.xml

@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>dolphinscheduler-dist</artifactId>
-        <groupId>org.apache.dolphinscheduler</groupId>
-        <version>1.2.1-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dolphinscheduler-src</artifactId>
-    <name>${project.artifactId}</name>
-
-    <profiles>
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>src</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/dolphinscheduler-src.xml</descriptor>
-                                    </descriptors>
-                                    <appendAssemblyId>true</appendAssemblyId>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>jar-no-fork</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>

dolphinscheduler-dist/pom.xml

@@ -30,11 +30,78 @@
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
-    <modules>
-        <module>dolphinscheduler-backend</module>
-        <module>dolphinscheduler-front</module>
-        <module>dolphinscheduler-src</module>
-    </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.dolphinscheduler</groupId>
+            <artifactId>dolphinscheduler-server</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.dolphinscheduler</groupId>
+            <artifactId>dolphinscheduler-api</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>dolphinscheduler-bin</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/main/assembly/dolphinscheduler-binary.xml</descriptor>
+                                    </descriptors>
+                                    <appendAssemblyId>true</appendAssemblyId>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>src</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/main/assembly/dolphinscheduler-src.xml</descriptor>
+                                    </descriptors>
+                                    <appendAssemblyId>true</appendAssemblyId>
+                                </configuration>
+                            </execution>
+
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 
 </project>

dolphinscheduler-dist/dolphinscheduler-backend/src/main/assembly/dolphinscheduler-binary-backend.xml

@@ -19,17 +19,17 @@
 		xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>dolphinscheduler-backend-bin</id>
+	<id>dolphinscheduler-bin</id>
 	<formats>
 		<format>tar.gz</format>
 	</formats>
 	<includeBaseDirectory>true</includeBaseDirectory>
-	<baseDirectory>${project.build.finalName}-dolphinscheduler-backend-bin</baseDirectory>
+	<baseDirectory>${project.build.finalName}-dolphinscheduler-bin</baseDirectory>
 
 	<fileSets>
 		<!--alert start-->
 		<fileSet>
-			<directory>${basedir}/../../dolphinscheduler-alert/src/main/resources</directory>
+			<directory>${basedir}/../dolphinscheduler-alert/src/main/resources</directory>
 			<includes>
 				<include>**/*.properties</include>
 				<include>**/*.xml</include>
@@ -38,13 +38,6 @@
 			</includes>
 			<outputDirectory>./conf</outputDirectory>
 		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../../dolphinscheduler-alert/target/</directory>
-			<includes>
-				<include>dolphinscheduler-alert-${project.version}.jar</include>
-			</includes>
-			<outputDirectory>lib</outputDirectory>
-		</fileSet>
 		<!--alert end-->
 
 		<!--api start-->
@@ -58,7 +51,7 @@
 			<outputDirectory>conf</outputDirectory>
 		</fileSet>
 		<fileSet>
-			<directory>${basedir}/../../dolphinscheduler-common/src/main/resources</directory>
+			<directory>${basedir}/../dolphinscheduler-common/src/main/resources</directory>
 			<includes>
 				<include>**/*.properties</include>
 				<include>**/*.xml</include>
@@ -67,7 +60,7 @@
 			<outputDirectory>conf</outputDirectory>
 		</fileSet>
 		<fileSet>
-			<directory>${basedir}/../../dolphinscheduler-common/src/main/resources/bin</directory>
+			<directory>${basedir}/../dolphinscheduler-common/src/main/resources/bin</directory>
 			<includes>
 				<include>*.*</include>
 			</includes>
@@ -75,7 +68,7 @@
 			<outputDirectory>bin</outputDirectory>
 		</fileSet>
 		<fileSet>
-			<directory>${basedir}/../../dolphinscheduler-dao/src/main/resources</directory>
+			<directory>${basedir}/../dolphinscheduler-dao/src/main/resources</directory>
 			<includes>
 				<include>**/*.properties</include>
 				<include>**/*.xml</include>
@@ -84,7 +77,7 @@
 			<outputDirectory>conf</outputDirectory>
 		</fileSet>
 		<fileSet>
-			<directory>${basedir}/../../dolphinscheduler-api/src/main/resources</directory>
+			<directory>${basedir}/../dolphinscheduler-api/src/main/resources</directory>
 			<includes>
 				<include>**/*.properties</include>
 				<include>**/*.xml</include>
@@ -92,18 +85,11 @@
 			</includes>
 			<outputDirectory>conf</outputDirectory>
 		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../../dolphinscheduler-api/target/</directory>
-			<includes>
-				<include>dolphinscheduler-api-${project.version}.jar</include>
-			</includes>
-			<outputDirectory>lib</outputDirectory>
-		</fileSet>
 		<!--api end-->
 
 		<!--server start-->
 		<fileSet>
-			<directory>${basedir}/../../dolphinscheduler-server/src/main/resources</directory>
+			<directory>${basedir}/../dolphinscheduler-server/src/main/resources</directory>
 			<includes>
 				<include>**/*.properties</include>
 				<include>**/*.xml</include>
@@ -112,7 +98,7 @@
 			<outputDirectory>conf</outputDirectory>
 		</fileSet>
 		<fileSet>
-			<directory>${basedir}/../../dolphinscheduler-common/src/main/resources</directory>
+			<directory>${basedir}/../dolphinscheduler-common/src/main/resources</directory>
 			<includes>
 				<include>**/*.properties</include>
 				<include>**/*.xml</include>
@@ -121,7 +107,7 @@
 			<outputDirectory>conf</outputDirectory>
 		</fileSet>
 		<fileSet>
-			<directory>${basedir}/../../dolphinscheduler-common/src/main/resources/bin</directory>
+			<directory>${basedir}/../dolphinscheduler-common/src/main/resources/bin</directory>
 			<includes>
 				<include>*.*</include>
 			</includes>
@@ -129,7 +115,7 @@
 			<outputDirectory>bin</outputDirectory>
 		</fileSet>
 		<fileSet>
-			<directory>${basedir}/../../dolphinscheduler-dao/src/main/resources</directory>
+			<directory>${basedir}/../dolphinscheduler-dao/src/main/resources</directory>
 			<includes>
 				<include>**/*.properties</include>
 				<include>**/*.xml</include>
@@ -138,26 +124,18 @@
 			</includes>
 			<outputDirectory>conf</outputDirectory>
 		</fileSet>
-
-		<fileSet>
-			<directory>${basedir}/../../dolphinscheduler-server/target/</directory>
-			<includes>
-				<include>dolphinscheduler-server-${project.version}.jar</include>
-			</includes>
-			<outputDirectory>lib</outputDirectory>
-		</fileSet>
 		<!--server end-->
 
 		<fileSet>
-			<directory>${basedir}/../../dolphinscheduler-rpc/target/</directory>
+			<directory>${basedir}/../dolphinscheduler-server/target/dolphinscheduler-server-${project.version}</directory>
 			<includes>
-				<include>dolphinscheduler-rpc-${project.version}.jar</include>
+				<include>**/*.*</include>
 			</includes>
-			<outputDirectory>lib</outputDirectory>
+			<outputDirectory>.</outputDirectory>
 		</fileSet>
 
 		<fileSet>
-			<directory>${basedir}/../../dolphinscheduler-server/target/dolphinscheduler-server-${project.version}</directory>
+			<directory>${basedir}/../dolphinscheduler-api/target/dolphinscheduler-api-${project.version}</directory>
 			<includes>
 				<include>**/*.*</include>
 			</includes>
@@ -165,7 +143,7 @@
 		</fileSet>
 
 		<fileSet>
-			<directory>${basedir}/../../dolphinscheduler-api/target/dolphinscheduler-api-${project.version}</directory>
+			<directory>${basedir}/../dolphinscheduler-alert/target/dolphinscheduler-alert-${project.version}</directory>
 			<includes>
 				<include>**/*.*</include>
 			</includes>
@@ -173,15 +151,15 @@
 		</fileSet>
 
 		<fileSet>
-			<directory>${basedir}/../../dolphinscheduler-alert/target/dolphinscheduler-alert-${project.version}</directory>
+			<directory>${basedir}/../dolphinscheduler-ui/dist</directory>
 			<includes>
 				<include>**/*.*</include>
 			</includes>
-			<outputDirectory>.</outputDirectory>
+			<outputDirectory>./ui</outputDirectory>
 		</fileSet>
 
 		<fileSet>
-			<directory>${basedir}/../../sql</directory>
+			<directory>${basedir}/../sql</directory>
 			<includes>
 				<include>**/*</include>
 			</includes>
@@ -189,7 +167,7 @@
 		</fileSet>
 
 		<fileSet>
-			<directory>${basedir}/../../script</directory>
+			<directory>${basedir}/../script</directory>
 			<includes>
 				<include>*.*</include>
 			</includes>
@@ -197,7 +175,7 @@
 		</fileSet>
 
 		<fileSet>
-			<directory>${basedir}/../../script</directory>
+			<directory>${basedir}/../script</directory>
 			<includes>
 				<include>config/*.*</include>
 				<include>env/*.*</include>
@@ -206,7 +184,7 @@
 		</fileSet>
 
 		<fileSet>
-			<directory>${basedir}/../../script</directory>
+			<directory>${basedir}/../script</directory>
 			<includes>
 				<include>start-all.sh</include>
 				<include>stop-all.sh</include>
@@ -216,7 +194,7 @@
 		</fileSet>
 
 		<fileSet>
-			<directory>${basedir}/../.././</directory>
+			<directory>${basedir}/.././</directory>
 			<includes>
 				<include>*.sh</include>
 				<include>*.py</include>
@@ -226,14 +204,11 @@
 		</fileSet>
 
 		<fileSet>
-			<directory>${basedir}/../release-docs</directory>
+			<directory>${basedir}/release-docs</directory>
 			<useDefaultExcludes>true</useDefaultExcludes>
 			<includes>
 				<include>**/*</include>
 			</includes>
-			<excludes>
-				<exclude>**/licenses/ui-licenses/**</exclude>
-			</excludes>
 			<outputDirectory>.</outputDirectory>
 		</fileSet>
 
@@ -247,7 +222,6 @@
 				<exclude>javax.servlet:servlet-api</exclude>
 				<exclude>org.eclipse.jetty.aggregate:jetty-all</exclude>
 				<exclude>org.slf4j:slf4j-log4j12</exclude>
-				<exclude>org.apache.dolphinscheduler:dolphinscheduler-backend</exclude>
 			</excludes>
 		</dependencySet>
 	</dependencySets>

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

@@ -28,7 +28,7 @@
 
 	<fileSets>
 		<fileSet>
-			<directory>${basedir}/../../</directory>
+			<directory>${basedir}/../</directory>
 			<useDefaultExcludes>true</useDefaultExcludes>
 			<includes>
 				<include>**/*</include>

dolphinscheduler-ui/pom.xml

@@ -71,12 +71,12 @@
             </configuration>
           </execution>
           <execution>
-            <id>npm run build</id>
+            <id>npm run build:release</id>
             <goals>
               <goal>npm</goal>
             </goals>
             <configuration>
-              <arguments>run build</arguments>
+              <arguments>run build:release</arguments>
             </configuration>
           </execution>
         </executions>