From ab09ed439695c25849d051bce6e7852428157728 Mon Sep 17 00:00:00 2001
From: lgcareer <18610854716@163.com>
Date: Wed, 18 Dec 2019 16:27:34 +0800
Subject: [PATCH] merge frontend and backend tar into one binary tar (#1511)
---
.../dolphinscheduler-backend/pom.xml | 74 ------------------
.../dolphinscheduler-front/pom.xml | 59 --------------
.../dolphinscheduler-binary-front.xml | 71 -----------------
.../dolphinscheduler-src/pom.xml | 71 -----------------
dolphinscheduler-dist/pom.xml | 77 +++++++++++++++++--
.../assembly/dolphinscheduler-binary.xml} | 74 ++++++------------
.../main/assembly/dolphinscheduler-src.xml | 2 +-
dolphinscheduler-ui/pom.xml | 4 +-
8 files changed, 99 insertions(+), 333 deletions(-)
delete mode 100644 dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
delete mode 100644 dolphinscheduler-dist/dolphinscheduler-front/pom.xml
delete mode 100644 dolphinscheduler-dist/dolphinscheduler-front/src/main/assembly/dolphinscheduler-binary-front.xml
delete mode 100644 dolphinscheduler-dist/dolphinscheduler-src/pom.xml
rename dolphinscheduler-dist/{dolphinscheduler-backend/src/main/assembly/dolphinscheduler-binary-backend.xml => src/main/assembly/dolphinscheduler-binary.xml} (67%)
rename dolphinscheduler-dist/{dolphinscheduler-src => }/src/main/assembly/dolphinscheduler-src.xml (98%)
diff --git a/dolphinscheduler-dist/dolphinscheduler-backend/pom.xml b/dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
deleted file mode 100644
index 8954710f9f..0000000000
--- a/dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-
- dolphinscheduler-dist
- org.apache.dolphinscheduler
- 1.2.1-SNAPSHOT
-
- 4.0.0
- dolphinscheduler-backend
- ${project.artifactId}
-
-
-
- org.apache.dolphinscheduler
- dolphinscheduler-server
-
-
-
- org.apache.dolphinscheduler
- dolphinscheduler-api
-
-
-
-
-
-
- release
-
-
-
- maven-assembly-plugin
-
-
- dolphinscheduler-backend-bin
- package
-
- single
-
-
-
-
- src/main/assembly/dolphinscheduler-binary-backend.xml
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/dolphinscheduler-dist/dolphinscheduler-front/pom.xml b/dolphinscheduler-dist/dolphinscheduler-front/pom.xml
deleted file mode 100644
index 37120e6714..0000000000
--- a/dolphinscheduler-dist/dolphinscheduler-front/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
- dolphinscheduler-dist
- org.apache.dolphinscheduler
- 1.2.1-SNAPSHOT
-
- 4.0.0
-
- dolphinscheduler-front
- ${project.artifactId}
-
-
-
- release
-
-
-
- maven-assembly-plugin
-
-
- dolphinscheduler-front-bin
- package
-
- single
-
-
-
-
- src/main/assembly/dolphinscheduler-binary-front.xml
-
- true
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/dolphinscheduler-dist/dolphinscheduler-front/src/main/assembly/dolphinscheduler-binary-front.xml b/dolphinscheduler-dist/dolphinscheduler-front/src/main/assembly/dolphinscheduler-binary-front.xml
deleted file mode 100644
index ab6f148d43..0000000000
--- a/dolphinscheduler-dist/dolphinscheduler-front/src/main/assembly/dolphinscheduler-binary-front.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
- dolphinscheduler-front-bin
-
- tar.gz
-
- true
- ${project.build.finalName}-dolphinscheduler-front-bin
-
-
-
- ${basedir}/../../dolphinscheduler-ui/dist
-
- **/*.*
-
- ./dist
-
-
-
- ${basedir}/../../dolphinscheduler-ui
-
- install-dolphinscheduler-ui.sh
-
- .
-
-
-
- ${basedir}/../release-docs
-
- ./*
-
- .
-
-
-
- ${basedir}/../release-docs/licenses/ui-licenses
-
- **/*
-
- ./licenses
-
-
-
- ${basedir}/../.././
-
- DISCLAIMER
-
- .
-
-
-
-
\ No newline at end of file
diff --git a/dolphinscheduler-dist/dolphinscheduler-src/pom.xml b/dolphinscheduler-dist/dolphinscheduler-src/pom.xml
deleted file mode 100644
index 96151ec809..0000000000
--- a/dolphinscheduler-dist/dolphinscheduler-src/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-
-
- dolphinscheduler-dist
- org.apache.dolphinscheduler
- 1.2.1-SNAPSHOT
-
- 4.0.0
-
- dolphinscheduler-src
- ${project.artifactId}
-
-
-
- release
-
-
-
- maven-assembly-plugin
-
-
- src
- package
-
- single
-
-
-
- src/main/assembly/dolphinscheduler-src.xml
-
- true
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
-
-
- attach-sources
- verify
-
- jar-no-fork
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/dolphinscheduler-dist/pom.xml b/dolphinscheduler-dist/pom.xml
index 209b4679ce..3d01eff831 100644
--- a/dolphinscheduler-dist/pom.xml
+++ b/dolphinscheduler-dist/pom.xml
@@ -30,11 +30,78 @@
true
-
- dolphinscheduler-backend
- dolphinscheduler-front
- dolphinscheduler-src
-
+
+
+
+ org.apache.dolphinscheduler
+ dolphinscheduler-server
+
+
+
+ org.apache.dolphinscheduler
+ dolphinscheduler-api
+
+
+
+
+
+
+ release
+
+
+
+ maven-assembly-plugin
+
+
+ dolphinscheduler-bin
+ package
+
+ single
+
+
+
+
+ src/main/assembly/dolphinscheduler-binary.xml
+
+ true
+
+
+
+
+ src
+ package
+
+ single
+
+
+
+ src/main/assembly/dolphinscheduler-src.xml
+
+ true
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+
+ attach-sources
+ verify
+
+ jar-no-fork
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dolphinscheduler-dist/dolphinscheduler-backend/src/main/assembly/dolphinscheduler-binary-backend.xml b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-binary.xml
similarity index 67%
rename from dolphinscheduler-dist/dolphinscheduler-backend/src/main/assembly/dolphinscheduler-binary-backend.xml
rename to dolphinscheduler-dist/src/main/assembly/dolphinscheduler-binary.xml
index b873aeeb33..5cddadd4f5 100644
--- a/dolphinscheduler-dist/dolphinscheduler-backend/src/main/assembly/dolphinscheduler-binary-backend.xml
+++ b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-binary.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">
- dolphinscheduler-backend-bin
+ dolphinscheduler-bin
tar.gz
true
- ${project.build.finalName}-dolphinscheduler-backend-bin
+ ${project.build.finalName}-dolphinscheduler-bin
- ${basedir}/../../dolphinscheduler-alert/src/main/resources
+ ${basedir}/../dolphinscheduler-alert/src/main/resources
**/*.properties
**/*.xml
@@ -38,13 +38,6 @@
./conf
-
- ${basedir}/../../dolphinscheduler-alert/target/
-
- dolphinscheduler-alert-${project.version}.jar
-
- lib
-
@@ -58,7 +51,7 @@
conf
- ${basedir}/../../dolphinscheduler-common/src/main/resources
+ ${basedir}/../dolphinscheduler-common/src/main/resources
**/*.properties
**/*.xml
@@ -67,7 +60,7 @@
conf
- ${basedir}/../../dolphinscheduler-common/src/main/resources/bin
+ ${basedir}/../dolphinscheduler-common/src/main/resources/bin
*.*
@@ -75,7 +68,7 @@
bin
- ${basedir}/../../dolphinscheduler-dao/src/main/resources
+ ${basedir}/../dolphinscheduler-dao/src/main/resources
**/*.properties
**/*.xml
@@ -84,7 +77,7 @@
conf
- ${basedir}/../../dolphinscheduler-api/src/main/resources
+ ${basedir}/../dolphinscheduler-api/src/main/resources
**/*.properties
**/*.xml
@@ -92,18 +85,11 @@
conf
-
- ${basedir}/../../dolphinscheduler-api/target/
-
- dolphinscheduler-api-${project.version}.jar
-
- lib
-
- ${basedir}/../../dolphinscheduler-server/src/main/resources
+ ${basedir}/../dolphinscheduler-server/src/main/resources
**/*.properties
**/*.xml
@@ -112,7 +98,7 @@
conf
- ${basedir}/../../dolphinscheduler-common/src/main/resources
+ ${basedir}/../dolphinscheduler-common/src/main/resources
**/*.properties
**/*.xml
@@ -121,7 +107,7 @@
conf
- ${basedir}/../../dolphinscheduler-common/src/main/resources/bin
+ ${basedir}/../dolphinscheduler-common/src/main/resources/bin
*.*
@@ -129,7 +115,7 @@
bin
- ${basedir}/../../dolphinscheduler-dao/src/main/resources
+ ${basedir}/../dolphinscheduler-dao/src/main/resources
**/*.properties
**/*.xml
@@ -138,26 +124,18 @@
conf
-
-
- ${basedir}/../../dolphinscheduler-server/target/
-
- dolphinscheduler-server-${project.version}.jar
-
- lib
-
- ${basedir}/../../dolphinscheduler-rpc/target/
+ ${basedir}/../dolphinscheduler-server/target/dolphinscheduler-server-${project.version}
- dolphinscheduler-rpc-${project.version}.jar
+ **/*.*
- lib
+ .
- ${basedir}/../../dolphinscheduler-server/target/dolphinscheduler-server-${project.version}
+ ${basedir}/../dolphinscheduler-api/target/dolphinscheduler-api-${project.version}
**/*.*
@@ -165,7 +143,7 @@
- ${basedir}/../../dolphinscheduler-api/target/dolphinscheduler-api-${project.version}
+ ${basedir}/../dolphinscheduler-alert/target/dolphinscheduler-alert-${project.version}
**/*.*
@@ -173,15 +151,15 @@
- ${basedir}/../../dolphinscheduler-alert/target/dolphinscheduler-alert-${project.version}
+ ${basedir}/../dolphinscheduler-ui/dist
**/*.*
- .
+ ./ui
- ${basedir}/../../sql
+ ${basedir}/../sql
**/*
@@ -189,7 +167,7 @@
- ${basedir}/../../script
+ ${basedir}/../script
*.*
@@ -197,7 +175,7 @@
- ${basedir}/../../script
+ ${basedir}/../script
config/*.*
env/*.*
@@ -206,7 +184,7 @@
- ${basedir}/../../script
+ ${basedir}/../script
start-all.sh
stop-all.sh
@@ -216,7 +194,7 @@
- ${basedir}/../.././
+ ${basedir}/.././
*.sh
*.py
@@ -226,14 +204,11 @@
- ${basedir}/../release-docs
+ ${basedir}/release-docs
true
**/*
-
- **/licenses/ui-licenses/**
-
.
@@ -247,7 +222,6 @@
javax.servlet:servlet-api
org.eclipse.jetty.aggregate:jetty-all
org.slf4j:slf4j-log4j12
- org.apache.dolphinscheduler:dolphinscheduler-backend
diff --git a/dolphinscheduler-dist/dolphinscheduler-src/src/main/assembly/dolphinscheduler-src.xml b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-src.xml
similarity index 98%
rename from dolphinscheduler-dist/dolphinscheduler-src/src/main/assembly/dolphinscheduler-src.xml
rename to dolphinscheduler-dist/src/main/assembly/dolphinscheduler-src.xml
index 5a087caa8b..1e00dec021 100644
--- a/dolphinscheduler-dist/dolphinscheduler-src/src/main/assembly/dolphinscheduler-src.xml
+++ b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-src.xml
@@ -28,7 +28,7 @@
- ${basedir}/../../
+ ${basedir}/../
true
**/*
diff --git a/dolphinscheduler-ui/pom.xml b/dolphinscheduler-ui/pom.xml
index 87af50b433..9f338a2977 100644
--- a/dolphinscheduler-ui/pom.xml
+++ b/dolphinscheduler-ui/pom.xml
@@ -71,12 +71,12 @@
- npm run build
+ npm run build:release
npm
- run build
+ run build:release