This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 2e1d697 [Improvement][Build] Optimize long release name and remove
unused nginx release and upgrade spring boot version (#5308)
2e1d697 is described below
commit 2e1d6975fd0fe36f32ab2333494e57f32b790b44
Author: Shiwen Cheng <[email protected]>
AuthorDate: Sun Apr 25 09:55:38 2021 +0800
[Improvement][Build] Optimize long release name and remove unused nginx
release and upgrade spring boot version (#5308)
* [Build] Optimize long release name and remove unused nginx release
* [Build] Upgrade spring boot version
* [Improvement] Improve code style
---
README.md | 4 +-
README_zh_CN.md | 4 +-
docker/build/Dockerfile | 4 +-
.../application-api.properties.tpl | 4 +-
docker/build/hooks/build | 4 +-
docker/build/hooks/build.bat | 4 +-
.../api/configuration/AppConfiguration.java | 1 -
.../src/main/resources/application-api.properties | 4 +-
.../main/resources/i18n/messages_zh_CN.properties | 2 +-
dolphinscheduler-dist/pom.xml | 60 +----
dolphinscheduler-dist/release-docs/LICENSE | 78 +++----
...heduler-binary.xml => dolphinscheduler-bin.xml} | 43 ++--
.../src/main/assembly/dolphinscheduler-nginx.xml | 245 ---------------------
.../src/main/assembly/dolphinscheduler-src.xml | 120 +++++-----
dolphinscheduler-ui/.env | 7 +-
dolphinscheduler-ui/build/webpack.config.dev.js | 2 +-
dolphinscheduler-ui/install-dolphinscheduler-ui.sh | 234 --------------------
dolphinscheduler-ui/pom.xml | 61 +----
pom.xml | 4 +-
tools/dependencies/known-dependencies.txt | 66 +++---
20 files changed, 172 insertions(+), 779 deletions(-)
diff --git a/README.md b/README.md
index b618e4d..5c982c2 100644
--- a/README.md
+++ b/README.md
@@ -73,8 +73,8 @@ Please referer the official website document: [QuickStart in
Kubernetes](https:/
Artifact:
```
-dolphinscheduler-dist/target/apache-dolphinscheduler-${latest.release.version}-dolphinscheduler-bin.tar.gz:
Binary package of DolphinScheduler
-dolphinscheduler-dist/target/apache-dolphinscheduler-${latest.release.version}-src.zip:
Source code package of DolphinScheduler
+dolphinscheduler-dist/target/apache-dolphinscheduler-${latest.release.version}-bin.tar.gz:
Binary package of DolphinScheduler
+dolphinscheduler-dist/target/apache-dolphinscheduler-${latest.release.version}-src.tar.gz:
Source code package of DolphinScheduler
```
## Thanks
diff --git a/README_zh_CN.md b/README_zh_CN.md
index f11fcf2..39c0892 100644
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@@ -76,8 +76,8 @@ DolphinScheduler的工作计划：<a
href="https://github.com/apache/dolphinsche
制品:
```
-dolphinscheduler-dist/target/apache-dolphinscheduler-${latest.release.version}-dolphinscheduler-bin.tar.gz:
DolphinScheduler 二进制包
-dolphinscheduler-dist/target/apache-dolphinscheduler-${latest.release.version}-src.zip:
DolphinScheduler 源代码包
+dolphinscheduler-dist/target/apache-dolphinscheduler-${latest.release.version}-bin.tar.gz:
DolphinScheduler 二进制包
+dolphinscheduler-dist/target/apache-dolphinscheduler-${latest.release.version}-src.tar.gz:
DolphinScheduler 源代码包
```
## 感谢
diff --git a/docker/build/Dockerfile b/docker/build/Dockerfile
index 90b000d..d3c0403 100644
--- a/docker/build/Dockerfile
+++ b/docker/build/Dockerfile
@@ -34,8 +34,8 @@ RUN apk update && \
rm -rf /var/cache/apk/*
# 2. add dolphinscheduler
-ADD ./apache-dolphinscheduler-${VERSION}-dolphinscheduler-bin.tar.gz /opt/
-RUN ln -s /opt/apache-dolphinscheduler-${VERSION}-dolphinscheduler-bin
/opt/dolphinscheduler
+ADD ./apache-dolphinscheduler-${VERSION}-bin.tar.gz /opt/
+RUN ln -s /opt/apache-dolphinscheduler-${VERSION}-bin /opt/dolphinscheduler
ENV DOLPHINSCHEDULER_HOME /opt/dolphinscheduler
# 3. add configuration and modify permissions and set soft links
diff --git a/docker/build/conf/dolphinscheduler/application-api.properties.tpl
b/docker/build/conf/dolphinscheduler/application-api.properties.tpl
index f425881..caa8a9e 100644
--- a/docker/build/conf/dolphinscheduler/application-api.properties.tpl
+++ b/docker/build/conf/dolphinscheduler/application-api.properties.tpl
@@ -35,10 +35,10 @@ spring.servlet.multipart.max-request-size=1024MB
server.compression.enabled=true
server.compression.mime-types=text/html,text/xml,text/plain,text/css,text/javascript,application/javascript,application/json,application/xml
-# post content
+# max http post size
server.jetty.max-http-form-post-size=5000000
-# i18n
+# messages encoding
spring.messages.encoding=UTF-8
# i18n classpath folder , file prefix messages， if have many files, use ","
seperator
diff --git a/docker/build/hooks/build b/docker/build/hooks/build
index 30d4f17..78f8317 100755
--- a/docker/build/hooks/build
+++ b/docker/build/hooks/build
@@ -43,8 +43,8 @@ echo -e "mvn -B clean compile package -Prelease
-Dmaven.test.skip=true"
mvn -B clean compile package -Prelease -Dmaven.test.skip=true
# mv dolphinscheduler-bin.tar.gz file to docker/build directory
-echo -e "mv
$(pwd)/dolphinscheduler-dist/target/apache-dolphinscheduler-${VERSION}-dolphinscheduler-bin.tar.gz
$(pwd)/docker/build/\n"
-mv
$(pwd)/dolphinscheduler-dist/target/apache-dolphinscheduler-${VERSION}-dolphinscheduler-bin.tar.gz
$(pwd)/docker/build/
+echo -e "mv
$(pwd)/dolphinscheduler-dist/target/apache-dolphinscheduler-${VERSION}-bin.tar.gz
$(pwd)/docker/build/\n"
+mv
$(pwd)/dolphinscheduler-dist/target/apache-dolphinscheduler-${VERSION}-bin.tar.gz
$(pwd)/docker/build/
# docker build
BUILD_COMMAND="docker build --build-arg VERSION=${VERSION} -t
$DOCKER_REPO:${VERSION} $(pwd)/docker/build/"
diff --git a/docker/build/hooks/build.bat b/docker/build/hooks/build.bat
index 90b575e..bbd4b23 100644
--- a/docker/build/hooks/build.bat
+++ b/docker/build/hooks/build.bat
@@ -44,8 +44,8 @@ call mvn clean compile package -Prelease -DskipTests=true
if "%errorlevel%"=="1" goto :mvnFailed
:: move dolphinscheduler-bin.tar.gz file to docker/build directory
-echo "move
%cd%\dolphinscheduler-dist\target\apache-dolphinscheduler-%VERSION%-SNAPSHOT-dolphinscheduler-bin.tar.gz
%cd%\docker\build\"
-move
%cd%\dolphinscheduler-dist\target\apache-dolphinscheduler-%VERSION%-dolphinscheduler-bin.tar.gz
%cd%\docker\build\
+echo "move
%cd%\dolphinscheduler-dist\target\apache-dolphinscheduler-%VERSION%-bin.tar.gz
%cd%\docker\build\"
+move
%cd%\dolphinscheduler-dist\target\apache-dolphinscheduler-%VERSION%-bin.tar.gz
%cd%\docker\build\
:: docker build
echo "docker build --build-arg VERSION=%VERSION% -t %DOCKER_REPO%:%VERSION%
%cd%\docker\build\"
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/AppConfiguration.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/AppConfiguration.java
index 5fc291d..fb96116 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/AppConfiguration.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/AppConfiguration.java
@@ -37,7 +37,6 @@ import
org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import org.springframework.web.servlet.i18n.CookieLocaleResolver;
-
/**
* application configuration
*/
diff --git a/dolphinscheduler-api/src/main/resources/application-api.properties
b/dolphinscheduler-api/src/main/resources/application-api.properties
index 619fb89..a635ccc 100644
--- a/dolphinscheduler-api/src/main/resources/application-api.properties
+++ b/dolphinscheduler-api/src/main/resources/application-api.properties
@@ -35,10 +35,10 @@ spring.servlet.multipart.max-request-size=1024MB
server.compression.enabled=true
server.compression.mime-types=text/html,text/xml,text/plain,text/css,text/javascript,application/javascript,application/json,application/xml
-# post content
+# max http post size
server.jetty.max-http-form-post-size=5000000
-# i18n
+# messages encoding
spring.messages.encoding=UTF-8
# i18n classpath folder , file prefix messages， if have many files, use ","
seperator
diff --git
a/dolphinscheduler-api/src/main/resources/i18n/messages_zh_CN.properties
b/dolphinscheduler-api/src/main/resources/i18n/messages_zh_CN.properties
index f1e8ebe..b3390fe 100644
--- a/dolphinscheduler-api/src/main/resources/i18n/messages_zh_CN.properties
+++ b/dolphinscheduler-api/src/main/resources/i18n/messages_zh_CN.properties
@@ -52,7 +52,7 @@ COUNT_PROCESS_INSTANCE_NOTES=统计流程实例状态
COUNT_PROCESS_DEFINITION_BY_USER_NOTES=统计用户创建的流程定义
COUNT_COMMAND_STATE_NOTES=统计命令状态
COUNT_QUEUE_STATE_NOTES=统计队列里任务状态
-ACCESS_TOKEN_TAG=access token相关操作，需要先登录
+ACCESS_TOKEN_TAG=访问token相关操作
MONITOR_TAG=监控相关操作
MASTER_LIST_NOTES=master服务列表
WORKER_LIST_NOTES=worker服务列表
diff --git a/dolphinscheduler-dist/pom.xml b/dolphinscheduler-dist/pom.xml
index 9a0c151..fea9d4a 100644
--- a/dolphinscheduler-dist/pom.xml
+++ b/dolphinscheduler-dist/pom.xml
@@ -60,7 +60,7 @@
<configuration>
<descriptors>
-
<descriptor>src/main/assembly/dolphinscheduler-binary.xml</descriptor>
+
<descriptor>src/main/assembly/dolphinscheduler-bin.xml</descriptor>
</descriptors>
<appendAssemblyId>true</appendAssemblyId>
</configuration>
@@ -101,63 +101,6 @@
</profile>
<profile>
- <id>nginx</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>dolphinscheduler-nginx</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
-
- <configuration>
- <descriptors>
-
<descriptor>src/main/assembly/dolphinscheduler-nginx.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>
-
- <profile>
<id>rpmbuild</id>
<build>
<plugins>
@@ -429,5 +372,4 @@
</profiles>
-
</project>
\ No newline at end of file
diff --git a/dolphinscheduler-dist/release-docs/LICENSE
b/dolphinscheduler-dist/release-docs/LICENSE
index ae2af97..5358f5e 100644
--- a/dolphinscheduler-dist/release-docs/LICENSE
+++ b/dolphinscheduler-dist/release-docs/LICENSE
@@ -217,7 +217,7 @@ The text of each license is also included at
licenses/LICENSE-[project].txt.
apacheds-i18n 2.0.0-M15:
https://mvnrepository.com/artifact/org.apache.directory.server/apacheds-i18n/2.0.0-M15,
Apache 2.0
apacheds-kerberos-codec 2.0.0-M15:
https://mvnrepository.com/artifact/org.apache.directory.server/apacheds-kerberos-codec/2.0.0-M15,
Apache 2.0
- apache-el 8.5.35.1:
https://mvnrepository.com/artifact/org.mortbay.jasper/apache-el/8.5.35.1,
Apache 2.0
+ apache-el 8.5.54:
https://mvnrepository.com/artifact/org.mortbay.jasper/apache-el/8.5.54, Apache
2.0
api-asn1-api 1.0.0-M20:
https://mvnrepository.com/artifact/org.apache.directory.api/api-asn1-api/1.0.0-M20,
Apache 2.0
api-util 1.0.0-M20:
https://mvnrepository.com/artifact/org.apache.directory.api/api-util/1.0.0-M20,
Apache 2.0
async-http-client 1.6.5:
https://mvnrepository.com/artifact/com.ning/async-http-client, Apache 2.0
@@ -255,7 +255,7 @@ The text of each license is also included at
licenses/LICENSE-[project].txt.
derby 10.14.2.0: https://github.com/apache/derby, Apache 2.0
druid 1.1.14: https://mvnrepository.com/artifact/com.alibaba/druid/1.1.14,
Apache 2.0
error_prone_annotations 2.1.3
https://mvnrepository.com/artifact/com.google.errorprone/error_prone_annotations/2.1.3,
Apache 2.0
- gson 2.8.5: https://github.com/google/gson, Apache 2.0
+ gson 2.8.6: https://github.com/google/gson, Apache 2.0
guava 24.1-jre:
https://mvnrepository.com/artifact/com.google.guava/guava/24.1-jre, Apache 2.0
guice 3.0: https://mvnrepository.com/artifact/com.google.inject/guice/3.0,
Apache 2.0
guice-servlet 3.0:
https://mvnrepository.com/artifact/com.google.inject.extensions/guice-servlet/3.0,
Apache 2.0
@@ -274,7 +274,7 @@ The text of each license is also included at
licenses/LICENSE-[project].txt.
hadoop-yarn-client 2.7.3:
https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-yarn-client/2.7.3,
Apache 2.0
hadoop-yarn-common 2.7.3:
https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-yarn-common/2.7.3,
Apache 2.0
hadoop-yarn-server-common 2.7.3:
https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-yarn-server-common/2.7.3,
Apache 2.0
- hibernate-validator 6.0.14.Final:
https://github.com/hibernate/hibernate-validator, Apache 2.0
+ hibernate-validator 6.0.21.Final:
https://github.com/hibernate/hibernate-validator, Apache 2.0
HikariCP 3.2.0:
https://mvnrepository.com/artifact/com.zaxxer/HikariCP/3.2.0, Apache 2.0
hive-common 2.1.0:
https://mvnrepository.com/artifact/org.apache.hive/hive-common/2.1.0, Apache 2.0
hive-jdbc 2.1.0:
https://mvnrepository.com/artifact/org.apache.hive/hive-jdbc/2.1.0, Apache 2.0
@@ -287,7 +287,7 @@ The text of each license is also included at
licenses/LICENSE-[project].txt.
htrace-core 3.1.0-incubating:
https://mvnrepository.com/artifact/org.apache.htrace/htrace-core/3.1.0-incubating,
Apache 2.0
httpclient 4.4.1:
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient/4.4.1,
Apache 2.0
httpcore 4.4.1:
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore/4.4.1,
Apache 2.0
- httpmime 4.5.7:
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpmime/4.5.7,
Apache 2.0
+ httpmime 4.5.13:
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpmime/4.5.13,
Apache 2.0
jackson-annotations 2.10.5:
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations/2.10.5,
Apache 2.0
jackson-core 2.10.5: https://github.com/FasterXML/jackson-core, Apache 2.0
jackson-core-asl 1.9.13:
https://mvnrepository.com/artifact/org.codehaus.jackson/jackson-core-asl/1.9.13,
Apache 2.0
@@ -301,25 +301,25 @@ The text of each license is also included at
licenses/LICENSE-[project].txt.
javax.inject 1:
https://mvnrepository.com/artifact/javax.inject/javax.inject/1, Apache 2.0
javax.jdo-3.2.0-m3:
https://mvnrepository.com/artifact/org.datanucleus/javax.jdo/3.2.0-m3, Apache
2.0
java-xmlbuilder 0.4 :
https://mvnrepository.com/artifact/com.jamesmurty.utils/java-xmlbuilder/0.4,
Apache 2.0
- jboss-logging 3.3.2.Final:
https://mvnrepository.com/artifact/org.jboss.logging/jboss-logging/3.3.2.Final,
Apache 2.0
+ jboss-logging 3.3.3.Final:
https://mvnrepository.com/artifact/org.jboss.logging/jboss-logging/3.3.3.Final,
Apache 2.0
jdo-api 3.0.1: https://mvnrepository.com/artifact/javax.jdo/jdo-api/3.0.1,
Apache 2.0
jets3t 0.9.0:
https://mvnrepository.com/artifact/net.java.dev.jets3t/jets3t/0.9.0, Apache 2.0
jettison 1.1: https://github.com/jettison-json/jettison, Apache 2.0
jetty 6.1.26:
https://mvnrepository.com/artifact/org.mortbay.jetty/jetty/6.1.26, Apache 2.0
and EPL 1.0
- jetty-continuation 9.4.14.v20181114:
https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-continuation/9.4.14.v20181114,
Apache 2.0 and EPL 1.0
- jetty-http 9.4.14.v20181114:
https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-http/9.4.14.v20181114,
Apache 2.0 and EPL 1.0
- jetty-io 9.4.14.v20181114:
https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-io/9.4.14.v20181114,
Apache 2.0 and EPL 1.0
- jetty-security 9.4.14.v20181114:
https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-security/9.4.14.v20181114,
Apache 2.0 and EPL 1.0
- jetty-server 9.4.14.v20181114:
https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-server/9.4.14.v20181114,
Apache 2.0 and EPL 1.0
- jetty-servlet 9.4.14.v20181114:
https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-servlet/9.4.14.v20181114,
Apache 2.0 and EPL 1.0
- jetty-servlets 9.4.14.v20181114:
https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-servlets/9.4.14.v20181114,
Apache 2.0 and EPL 1.0
+ jetty-continuation 9.4.33.v20201020:
https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-continuation/9.4.33.v20201020,
Apache 2.0 and EPL 1.0
+ jetty-http 9.4.33.v20201020:
https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-http/9.4.33.v20201020,
Apache 2.0 and EPL 1.0
+ jetty-io 9.4.33.v20201020:
https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-io/9.4.33.v20201020,
Apache 2.0 and EPL 1.0
+ jetty-security 9.4.33.v20201020:
https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-security/9.4.33.v20201020,
Apache 2.0 and EPL 1.0
+ jetty-server 9.4.33.v20201020:
https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-server/9.4.33.v20201020,
Apache 2.0 and EPL 1.0
+ jetty-servlet 9.4.33.v20201020:
https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-servlet/9.4.33.v20201020,
Apache 2.0 and EPL 1.0
+ jetty-servlets 9.4.33.v20201020:
https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-servlets/9.4.33.v20201020,
Apache 2.0 and EPL 1.0
jetty-util 6.1.26:
https://mvnrepository.com/artifact/org.mortbay.jetty/jetty-util/6.1.26, Apache
2.0 and EPL 1.0
- jetty-util 9.4.14.v20181114:
https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-util/9.4.14.v20181114,
Apache 2.0 and EPL 1.0
- jetty-webapp 9.4.14.v20181114:
https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-webapp/9.4.14.v20181114,
Apache 2.0 and EPL 1.0
- jetty-xml 9.4.14.v20181114:
https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-xml/9.4.14.v20181114,
Apache 2.0 and EPL 1.0
+ jetty-util 9.4.33.v20201020:
https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-util/9.4.33.v20201020,
Apache 2.0 and EPL 1.0
+ jetty-webapp 9.4.33.v20201020:
https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-webapp/9.4.33.v20201020,
Apache 2.0 and EPL 1.0
+ jetty-xml 9.4.33.v20201020:
https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-xml/9.4.33.v20201020,
Apache 2.0 and EPL 1.0
jna 4.5.2: https://mvnrepository.com/artifact/net.java.dev.jna/jna/4.5.2,
Apache 2.0 and LGPL 2.1
jna-platform 4.5.2:
https://mvnrepository.com/artifact/net.java.dev.jna/jna-platform/4.5.2, Apache
2.0 and LGPL 2.1
- joda-time 2.10.1: https://github.com/JodaOrg/joda-time, Apache 2.0
+ joda-time 2.10.8: https://github.com/JodaOrg/joda-time, Apache 2.0
jpam 1.1: https://mvnrepository.com/artifact/net.sf.jpam/jpam/1.1, Apache
2.0
jsqlparser 2.1: https://github.com/JSQLParser/JSqlParser, Apache 2.0 or
LGPL 2.1
jsr305 3.0.0:
https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305, Apache 2.0
@@ -352,7 +352,7 @@ The text of each license is also included at
licenses/LICENSE-[project].txt.
mybatis-plus-extension 3.2.0:
https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-extension/3.2.0,
Apache 2.0
mybatis-spring 2.0.2:
https://mvnrepository.com/artifact/org.mybatis/mybatis-spring/2.0.2, Apache 2.0
netty 3.6.2.Final: https://github.com/netty/netty, Apache 2.0
- netty-all 4.1.33.Final:
https://github.com/netty/netty/blob/netty-4.1.33.Final/LICENSE.txt, Apache 2.0
+ netty-all 4.1.53.Final:
https://github.com/netty/netty/blob/netty-4.1.53.Final/LICENSE.txt, Apache 2.0
opencsv 2.3:
https://mvnrepository.com/artifact/net.sf.opencsv/opencsv/2.3, Apache 2.0
parquet-hadoop-bundle 1.8.1:
https://mvnrepository.com/artifact/org.apache.parquet/parquet-hadoop-bundle/1.8.1,
Apache 2.0
poi 3.17: https://mvnrepository.com/artifact/org.apache.poi/poi/3.17,
Apache 2.0
@@ -369,20 +369,20 @@ The text of each license is also included at
licenses/LICENSE-[project].txt.
snakeyaml 1.23:
https://mvnrepository.com/artifact/org.yaml/snakeyaml/1.23, Apache 2.0
snappy 0.2: https://mvnrepository.com/artifact/org.iq80.snappy/snappy/0.2,
Apache 2.0
snappy-java 1.0.4.1: https://github.com/xerial/snappy-java, Apache 2.0
- spring-aop 5.1.18.RELEASE:
https://mvnrepository.com/artifact/org.springframework/spring-aop/5.1.18.RELEASE,
Apache 2.0
- spring-beans 5.1.18.RELEASE:
https://mvnrepository.com/artifact/org.springframework/spring-beans/5.1.18.RELEASE,
Apache 2.0
- spring-boot 2.1.17.RELEASE:
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot/2.1.17.RELEASE,
Apache 2.0
- spring-boot-autoconfigure 2.1.17.RELEASE:
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-autoconfigure/2.1.17.RELEASE,
Apache 2.0
- spring-boot-starter 2.1.17.RELEASE:
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter/2.1.17.RELEASE,
Apache 2.0
- spring-boot-starter-aop 2.1.17.RELEASE:
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-aop/2.1.17.RELEASE,
Apache 2.0
- spring-boot-starter-jdbc 2.1.17.RELEASE:
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-jdbc/2.1.17.RELEASE,
Apache 2.0
- spring-boot-starter-jetty 2.1.17.RELEASE:
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-jetty/2.1.17.RELEASE,
Apache 2.0
- spring-boot-starter-json 2.1.17.RELEASE:
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-json/2.1.17.RELEASE,
Apache 2.0
- spring-boot-starter-logging 2.1.17.RELEASE:
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-logging/2.1.17.RELEASE,
Apache 2.0
- spring-boot-starter-web 2.1.17.RELEASE:
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web/2.1.17.RELEASE,
Apache 2.0
- spring-context 5.1.18.RELEASE:
https://mvnrepository.com/artifact/org.springframework/spring-context/5.1.18.RELEASE,
Apache 2.0
- spring-core 5.1.18.RELEASE:
https://mvnrepository.com/artifact/org.springframework/spring-core/5.1.18.RELEASE,
Apache 2.0
- spring-expression 5.1.18.RELEASE:
https://mvnrepository.com/artifact/org.springframework/spring-expression/5.1.18.RELEASE,
Apache 2.0
+ spring-aop 5.1.19.RELEASE:
https://mvnrepository.com/artifact/org.springframework/spring-aop/5.1.19.RELEASE,
Apache 2.0
+ spring-beans 5.1.19.RELEASE:
https://mvnrepository.com/artifact/org.springframework/spring-beans/5.1.19.RELEASE,
Apache 2.0
+ spring-boot 2.1.18.RELEASE:
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot/2.1.18.RELEASE,
Apache 2.0
+ spring-boot-autoconfigure 2.1.18.RELEASE:
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-autoconfigure/2.1.18.RELEASE,
Apache 2.0
+ spring-boot-starter 2.1.18.RELEASE:
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter/2.1.18.RELEASE,
Apache 2.0
+ spring-boot-starter-aop 2.1.18.RELEASE:
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-aop/2.1.18.RELEASE,
Apache 2.0
+ spring-boot-starter-jdbc 2.1.18.RELEASE:
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-jdbc/2.1.18.RELEASE,
Apache 2.0
+ spring-boot-starter-jetty 2.1.18.RELEASE:
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-jetty/2.1.18.RELEASE,
Apache 2.0
+ spring-boot-starter-json 2.1.18.RELEASE:
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-json/2.1.18.RELEASE,
Apache 2.0
+ spring-boot-starter-logging 2.1.18.RELEASE:
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-logging/2.1.18.RELEASE,
Apache 2.0
+ spring-boot-starter-web 2.1.18.RELEASE:
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web/2.1.18.RELEASE,
Apache 2.0
+ spring-context 5.1.19.RELEASE:
https://mvnrepository.com/artifact/org.springframework/spring-context/5.1.19.RELEASE,
Apache 2.0
+ spring-core 5.1.19.RELEASE:
https://mvnrepository.com/artifact/org.springframework/spring-core, Apache 2.0
+ spring-expression 5.1.19.RELEASE:
https://mvnrepository.com/artifact/org.springframework/spring-expression,
Apache 2.0
springfox-core 2.9.2:
https://mvnrepository.com/artifact/io.springfox/springfox-core, Apache 2.0
springfox-schema 2.9.2:
https://mvnrepository.com/artifact/io.springfox/springfox-schema, Apache 2.0
springfox-spi 2.9.2:
https://mvnrepository.com/artifact/io.springfox/springfox-spi, Apache 2.0
@@ -390,16 +390,16 @@ The text of each license is also included at
licenses/LICENSE-[project].txt.
springfox-swagger2 2.9.2:
https://mvnrepository.com/artifact/io.springfox/springfox-swagger2/2.9.2,
Apache 2.0
springfox-swagger-common 2.9.2:
https://mvnrepository.com/artifact/io.springfox/springfox-swagger-common/2.9.2,
Apache 2.0
springfox-swagger-ui 2.9.2:
https://mvnrepository.com/artifact/io.springfox/springfox-swagger-ui/2.9.2,
Apache 2.0
- spring-jcl 5.1.18.RELEASE:
https://mvnrepository.com/artifact/org.springframework/spring-jcl/5.1.18.RELEASE,
Apache 2.0
- spring-jdbc 5.1.18.RELEASE:
https://mvnrepository.com/artifact/org.springframework/spring-jdbc/5.1.18.RELEASE,
Apache 2.0
+ spring-jcl 5.1.19.RELEASE:
https://mvnrepository.com/artifact/org.springframework/spring-jcl/5.1.19.RELEASE,
Apache 2.0
+ spring-jdbc 5.1.19.RELEASE:
https://mvnrepository.com/artifact/org.springframework/spring-jdbc/5.1.19.RELEASE,
Apache 2.0
spring-plugin-core 1.2.0.RELEASE:
https://mvnrepository.com/artifact/org.springframework.plugin/spring-plugin-core/1.2.0.RELEASE,
Apache 2.0
spring-plugin-metadata 1.2.0.RELEASE:
https://mvnrepository.com/artifact/org.springframework.plugin/spring-plugin-metadata/1.2.0.RELEASE,
Apache 2.0
- spring-tx 5.1.18.RELEASE:
https://mvnrepository.com/artifact/org.springframework/spring-tx/5.1.18.RELEASE,
Apache 2.0
- spring-web 5.1.18.RELEASE:
https://mvnrepository.com/artifact/org.springframework/spring-web/5.1.18.RELEASE,
Apache 2.0
- spring-webmvc 5.1.18.RELEASE:
https://mvnrepository.com/artifact/org.springframework/spring-webmvc/5.1.18.RELEASE,
Apache 2.0
+ spring-tx 5.1.19.RELEASE:
https://mvnrepository.com/artifact/org.springframework/spring-tx/5.1.19.RELEASE,
Apache 2.0
+ spring-web 5.1.19.RELEASE:
https://mvnrepository.com/artifact/org.springframework/spring-web/5.1.19.RELEASE,
Apache 2.0
+ spring-webmvc 5.1.19.RELEASE:
https://mvnrepository.com/artifact/org.springframework/spring-webmvc/5.1.19.RELEASE,
Apache 2.0
swagger-annotations 1.5.20:
https://mvnrepository.com/artifact/io.swagger/swagger-annotations/1.5.20,
Apache 2.0
swagger-bootstrap-ui 1.9.3:
https://mvnrepository.com/artifact/com.github.xiaoymin/swagger-bootstrap-ui/1.9.3,
Apache 2.0
- swagger-models 1.5.20:
https://mvnrepository.com/artifact/io.swagger/swagger-models/1.5.20, Apache 2.0
+ swagger-models 1.5.24:
https://mvnrepository.com/artifact/io.swagger/swagger-models/1.5.24, Apache 2.0
tephra-api 0.6.0:
https://mvnrepository.com/artifact/co.cask.tephra/tephra-api/0.6.0, Apache 2.0
validation-api 2.0.1.Final:
https://mvnrepository.com/artifact/javax.validation/validation-api/2.0.1.Final,
Apache 2.0
wagon-provider-api 2.2:
https://mvnrepository.com/artifact/org.apache.maven.wagon/wagon-provider-api/2.2,
Apache 2.0
@@ -468,7 +468,7 @@ The text of each license is also included at
licenses/LICENSE-[project].txt.
aether-impl 1.13.1:
https://mvnrepository.com/artifact/org.sonatype.aether/aether-impl/1.13.1, EPL
1.0
aether-spi 1.13.1:
https://mvnrepository.com/artifact/org.sonatype.aether/aether-spi/1.13.1, EPL
1.0
aether-util 1.13.1:
https://mvnrepository.com/artifact/org.sonatype.aether/aether-util/1.13.1, EPL
1.0
- aspectjweaver
1.9.2:https://mvnrepository.com/artifact/org.aspectj/aspectjweaver/1.9.2, EPL
1.0
+ aspectjweaver
1.9.6:https://mvnrepository.com/artifact/org.aspectj/aspectjweaver/1.9.6, EPL
1.0
logback-classic 1.2.3:
https://mvnrepository.com/artifact/ch.qos.logback/logback-classic/1.2.3, EPL
1.0 and LGPL 2.1
logback-core 1.2.3:
https://mvnrepository.com/artifact/ch.qos.logback/logback-core/1.2.3, EPL 1.0
and LGPL 2.1
oshi-core 3.9.1:
https://mvnrepository.com/artifact/com.github.oshi/oshi-core/3.9.1, EPL 1.0
@@ -482,7 +482,7 @@ MIT licenses
The following components are provided under a MIT 2.0 license. See project
link for details.
The text of each license is also included at licenses/LICENSE-[project].txt.
- jul-to-slf4j 1.7.25:
https://mvnrepository.com/artifact/org.slf4j/jul-to-slf4j/1.7.25, MIT
+ jul-to-slf4j 1.7.30:
https://mvnrepository.com/artifact/org.slf4j/jul-to-slf4j/1.7.30, MIT
mssql-jdbc 6.1.0.jre8:
https://mvnrepository.com/artifact/com.microsoft.sqlserver/mssql-jdbc/6.1.0.jre8,
MIT
slf4j-api 1.7.5:
https://mvnrepository.com/artifact/org.slf4j/slf4j-api/1.7.5, MIT
animal-sniffer-annotations 1.14
https://mvnrepository.com/artifact/org.codehaus.mojo/animal-sniffer-annotations/1.14,
MIT
diff --git
a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-binary.xml
b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-bin.xml
similarity index 91%
rename from dolphinscheduler-dist/src/main/assembly/dolphinscheduler-binary.xml
rename to dolphinscheduler-dist/src/main/assembly/dolphinscheduler-bin.xml
index 1ef5c2e..e72402b 100644
--- a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-binary.xml
+++ b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-bin.xml
@@ -19,15 +19,14 @@
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-bin</id>
+ <id>bin</id>
<formats>
<format>tar.gz</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
-
<baseDirectory>${project.build.finalName}-dolphinscheduler-bin</baseDirectory>
+ <baseDirectory>${project.build.finalName}-bin</baseDirectory>
<fileSets>
- <!--alert start-->
<fileSet>
<directory>${basedir}/../dolphinscheduler-alert/src/main/resources</directory>
<includes>
@@ -36,20 +35,22 @@
<include>**/*.json</include>
<include>**/*.ftl</include>
</includes>
- <outputDirectory>./conf</outputDirectory>
+ <outputDirectory>conf</outputDirectory>
</fileSet>
- <!--alert end-->
- <!--api start-->
<fileSet>
- <directory>src/main/resources</directory>
+
<directory>${basedir}/../dolphinscheduler-api/src/main/resources</directory>
<includes>
<include>**/*.properties</include>
<include>**/*.xml</include>
<include>**/*.json</include>
</includes>
+ <excludes>
+ <exclude>application.properties</exclude>
+ </excludes>
<outputDirectory>conf</outputDirectory>
</fileSet>
+
<fileSet>
<directory>${basedir}/../dolphinscheduler-common/src/main/resources</directory>
<includes>
@@ -59,6 +60,7 @@
</includes>
<outputDirectory>conf</outputDirectory>
</fileSet>
+
<fileSet>
<directory>${basedir}/../dolphinscheduler-common/src/main/resources/bin</directory>
<includes>
@@ -67,6 +69,7 @@
<directoryMode>755</directoryMode>
<outputDirectory>bin</outputDirectory>
</fileSet>
+
<fileSet>
<directory>${basedir}/../dolphinscheduler-dao/src/main/resources</directory>
<includes>
@@ -74,20 +77,12 @@
<include>**/*.xml</include>
<include>**/*.json</include>
</includes>
+ <excludes>
+ <exclude>org/apache/dolphinscheduler/dao/mapper/*.xml</exclude>
+ </excludes>
<outputDirectory>conf</outputDirectory>
</fileSet>
- <fileSet>
-
<directory>${basedir}/../dolphinscheduler-api/src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.json</include>
- </includes>
- <outputDirectory>conf</outputDirectory>
- </fileSet>
- <!--api end-->
- <!--server start-->
<fileSet>
<directory>${basedir}/../dolphinscheduler-server/src/main/resources</directory>
<includes>
@@ -99,9 +94,8 @@
<outputDirectory>conf</outputDirectory>
</fileSet>
-
<fileSet>
-
<directory>${basedir}/../dolphinscheduler-dao/src/main/resources</directory>
+
<directory>${basedir}/../dolphinscheduler-service/src/main/resources</directory>
<includes>
<include>**/*.properties</include>
<include>**/*.xml</include>
@@ -110,22 +104,16 @@
</includes>
<outputDirectory>conf</outputDirectory>
</fileSet>
- <!--server end-->
-
- <!--service start-->
<fileSet>
-
<directory>${basedir}/../dolphinscheduler-service/src/main/resources</directory>
+ <directory>src/main/resources</directory>
<includes>
<include>**/*.properties</include>
<include>**/*.xml</include>
<include>**/*.json</include>
- <include>**/*.yml</include>
</includes>
<outputDirectory>conf</outputDirectory>
</fileSet>
- <!--service end-->
-
<fileSet>
<directory>${basedir}/../dolphinscheduler-server/target/dolphinscheduler-server-${project.version}</directory>
@@ -151,7 +139,6 @@
<outputDirectory>.</outputDirectory>
</fileSet>
- <!--alert plugin-->
<fileSet>
<directory>${basedir}/../dolphinscheduler-dist/target/dolphinscheduler-dist-${project.version}</directory>
<includes>
diff --git a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-nginx.xml
b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-nginx.xml
deleted file mode 100644
index d5aa020..0000000
--- a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-nginx.xml
+++ /dev/null
@@ -1,245 +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-nginx</id>
- <formats>
- <format>tar.gz</format>
- </formats>
- <includeBaseDirectory>true</includeBaseDirectory>
-
<baseDirectory>${project.build.finalName}-dolphinscheduler-bin</baseDirectory>
-
- <fileSets>
- <!--alert start-->
- <fileSet>
-
<directory>${basedir}/../dolphinscheduler-alert/src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.json</include>
- <include>**/*.ftl</include>
- </includes>
- <outputDirectory>./conf</outputDirectory>
- </fileSet>
- <!--alert end-->
-
- <!--api start-->
- <fileSet>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.json</include>
- </includes>
- <outputDirectory>conf</outputDirectory>
- </fileSet>
- <fileSet>
-
<directory>${basedir}/../dolphinscheduler-common/src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.json</include>
- </includes>
- <outputDirectory>conf</outputDirectory>
- </fileSet>
- <fileSet>
-
<directory>${basedir}/../dolphinscheduler-common/src/main/resources/bin</directory>
- <includes>
- <include>*.*</include>
- </includes>
- <directoryMode>755</directoryMode>
- <outputDirectory>bin</outputDirectory>
- </fileSet>
- <fileSet>
-
<directory>${basedir}/../dolphinscheduler-dao/src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.json</include>
- </includes>
- <outputDirectory>conf</outputDirectory>
- </fileSet>
- <fileSet>
-
<directory>${basedir}/../dolphinscheduler-api/src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.json</include>
- </includes>
- <outputDirectory>conf</outputDirectory>
- </fileSet>
- <!--api end-->
-
- <!--server start-->
- <fileSet>
-
<directory>${basedir}/../dolphinscheduler-server/src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.json</include>
- <include>config/*.*</include>
- </includes>
- <outputDirectory>conf</outputDirectory>
- </fileSet>
-
-
- <fileSet>
-
<directory>${basedir}/../dolphinscheduler-dao/src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.json</include>
- <include>**/*.yml</include>
- </includes>
- <outputDirectory>conf</outputDirectory>
- </fileSet>
- <!--server end-->
-
-
- <!--service end-->
- <fileSet>
-
<directory>${basedir}/../dolphinscheduler-service/src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.json</include>
- <include>**/*.yml</include>
- </includes>
- <outputDirectory>conf</outputDirectory>
- </fileSet>
- <!--service end-->
-
-
- <fileSet>
-
<directory>${basedir}/../dolphinscheduler-server/target/dolphinscheduler-server-${project.version}</directory>
- <includes>
- <include>**/*.*</include>
- </includes>
- <outputDirectory>.</outputDirectory>
- </fileSet>
-
- <fileSet>
-
<directory>${basedir}/../dolphinscheduler-api/target/dolphinscheduler-api-${project.version}</directory>
- <includes>
- <include>**/*.*</include>
- </includes>
- <outputDirectory>.</outputDirectory>
- </fileSet>
-
- <fileSet>
-
<directory>${basedir}/../dolphinscheduler-alert/target/dolphinscheduler-alert-${project.version}</directory>
- <includes>
- <include>**/*.*</include>
- </includes>
- <outputDirectory>.</outputDirectory>
- </fileSet>
- <!--alert plugin-->
- <fileSet>
-
<directory>${basedir}/../dolphinscheduler-dist/target/dolphinscheduler-dist-${project.version}</directory>
- <includes>
- <include>**/*.*</include>
- </includes>
- <outputDirectory>.</outputDirectory>
- </fileSet>
-
- <fileSet>
-
<directory>${basedir}/../dolphinscheduler-ui/dist</directory>
- <includes>
- <include>**/*.*</include>
- </includes>
- <outputDirectory>./ui/dist</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../dolphinscheduler-ui</directory>
- <includes>
-
<include>install-dolphinscheduler-ui.sh</include>
- </includes>
- <outputDirectory>./ui</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../sql</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <outputDirectory>./sql</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../script</directory>
- <includes>
- <include>*.*</include>
- </includes>
- <outputDirectory>./script</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../script</directory>
- <includes>
- <include>env/*.*</include>
- </includes>
- <outputDirectory>./conf</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../script</directory>
- <includes>
- <include>start-all.sh</include>
- <include>stop-all.sh</include>
- <include>dolphinscheduler-daemon.sh</include>
- <include>status-all.sh</include>
- </includes>
- <outputDirectory>./bin</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/.././</directory>
- <includes>
- <include>*.sh</include>
- <include>*.py</include>
- <include>DISCLAIMER</include>
- </includes>
- <outputDirectory>.</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/release-docs</directory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <includes>
- <include>**/*</include>
- </includes>
- <outputDirectory>.</outputDirectory>
- </fileSet>
-
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <useProjectArtifact>true</useProjectArtifact>
- <excludes>
- <exclude>javax.servlet:servlet-api</exclude>
-
<exclude>org.eclipse.jetty.aggregate:jetty-all</exclude>
- <exclude>org.slf4j:slf4j-log4j12</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-</assembly>
\ No newline at end of file
diff --git a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-src.xml
b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-src.xml
index 1e00dec..e675cfb 100644
--- a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-src.xml
+++ b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-src.xml
@@ -16,72 +16,72 @@
-->
<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>src</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${project.build.finalName}-src-release</baseDirectory>
+
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>src</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>${project.build.finalName}-src</baseDirectory>
- <fileSets>
- <fileSet>
- <directory>${basedir}/../</directory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <!-- github ignore -->
- <exclude>**/.github/**</exclude>
- <exclude>.travis.yml</exclude>
+ <fileSets>
+ <fileSet>
+ <directory>${basedir}/../</directory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <!-- github ignore -->
+ <exclude>**/.github/**</exclude>
+ <exclude>.travis.yml</exclude>
- <!-- maven ignore -->
- <exclude>**/target/**</exclude>
- <exclude>**/*.class</exclude>
- <exclude>**/*.jar</exclude>
- <exclude>**/*.war</exclude>
- <exclude>**/*.zip</exclude>
- <exclude>**/*.tar</exclude>
- <exclude>**/*.tar.gz</exclude>
+ <!-- maven ignore -->
+ <exclude>**/target/**</exclude>
+ <exclude>**/*.class</exclude>
+ <exclude>**/*.jar</exclude>
+ <exclude>**/*.war</exclude>
+ <exclude>**/*.zip</exclude>
+ <exclude>**/*.tar</exclude>
+ <exclude>**/*.tar.gz</exclude>
- <!-- maven plugin ignore -->
- <exclude>release.properties</exclude>
- <exclude>**/pom.xml.releaseBackup</exclude>
- <exclude>**/cobertura.ser</exclude>
- <exclude>*.gpg</exclude>
+ <!-- maven plugin ignore -->
+ <exclude>release.properties</exclude>
+ <exclude>**/pom.xml.releaseBackup</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <exclude>*.gpg</exclude>
- <!-- node ignore -->
-
<exclude>**/dolphinscheduler-ui/dist/**</exclude>
-
<exclude>**/dolphinscheduler-ui/node/**</exclude>
-
<exclude>**/dolphinscheduler-ui/node_modules/**</exclude>
+ <!-- node ignore -->
+ <exclude>**/dolphinscheduler-ui/dist/**</exclude>
+ <exclude>**/dolphinscheduler-ui/node/**</exclude>
+ <exclude>**/dolphinscheduler-ui/node_modules/**</exclude>
- <!-- eclipse ignore -->
- <exclude>**/.settings/**</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.classpath</exclude>
+ <!-- eclipse ignore -->
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.classpath</exclude>
- <!-- idea ignore -->
- <exclude>**/.idea/**</exclude>
- <exclude>**/*.ipr</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/*.iws</exclude>
+ <!-- idea ignore -->
+ <exclude>**/.idea/**</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.iws</exclude>
- <!-- temp ignore -->
- <exclude>**/logs/**</exclude>
- <exclude>**/*.log</exclude>
- <exclude>**/*.doc</exclude>
- <exclude>**/*.cache</exclude>
- <exclude>**/*.diff</exclude>
- <exclude>**/*.patch</exclude>
- <exclude>**/*.tmp</exclude>
+ <!-- temp ignore -->
+ <exclude>**/logs/**</exclude>
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.doc</exclude>
+ <exclude>**/*.cache</exclude>
+ <exclude>**/*.diff</exclude>
+ <exclude>**/*.patch</exclude>
+ <exclude>**/*.tmp</exclude>
- <!-- system ignore -->
- <exclude>**/.DS_Store</exclude>
- <exclude>**/Thumbs.db</exclude>
- </excludes>
- </fileSet>
- </fileSets>
+ <!-- system ignore -->
+ <exclude>**/.DS_Store</exclude>
+ <exclude>**/Thumbs.db</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
</assembly>
\ No newline at end of file
diff --git a/dolphinscheduler-ui/.env b/dolphinscheduler-ui/.env
index e676be6..bd768bc 100644
--- a/dolphinscheduler-ui/.env
+++ b/dolphinscheduler-ui/.env
@@ -14,7 +14,8 @@
# limitations under the License.
# back end interface address
-API_BASE = http://192.168.xx.xx:12345
+API_BASE = http://127.0.0.1:12345
-# If IP access is required for local development, remove the "#"
-#DEV_HOST = 192.168.xx.xx
+# host and port for local development
+# DEV_HOST = 127.0.0.1
+# DEV_PORT = 8888
diff --git a/dolphinscheduler-ui/build/webpack.config.dev.js
b/dolphinscheduler-ui/build/webpack.config.dev.js
index ea25033..0513789 100644
--- a/dolphinscheduler-ui/build/webpack.config.dev.js
+++ b/dolphinscheduler-ui/build/webpack.config.dev.js
@@ -32,8 +32,8 @@ const config = merge.smart(baseConfig, {
hot: true,
contentBase: assetsDir,
publicPath: baseConfig.output.publicPath,
- port: getEnv('DEV_PORT', 8888),
host: getEnv('DEV_HOST', 'localhost'),
+ port: getEnv('DEV_PORT', 8888),
noInfo: false,
overlay: { warnings: false, errors: true },
historyApiFallback: true,
diff --git a/dolphinscheduler-ui/install-dolphinscheduler-ui.sh
b/dolphinscheduler-ui/install-dolphinscheduler-ui.sh
deleted file mode 100755
index b908c36..0000000
--- a/dolphinscheduler-ui/install-dolphinscheduler-ui.sh
+++ /dev/null
@@ -1,234 +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.
-
-#!/bin/bash
-# current path
-esc_basepath=$(cd `dirname $0`; pwd)
-
-menu(){
- cat <<END
-=================================================
- 1.CentOS6 Installation
- 2.CentOS7 Installation
- 3.Ubuntu Installation
- 4.Exit
-=================================================
-END
-}
-
-
-# create a file and configure nginx
-dolphinschedulerConf(){
-
- E_host='$host'
- E_remote_addr='$remote_addr'
- E_proxy_add_x_forwarded_for='$proxy_add_x_forwarded_for'
- E_http_upgrade='$http_upgrade'
- echo "
- server {
- listen $1;# access port
- server_name localhost;
- #charset koi8-r;
- #access_log /var/log/nginx/host.access.log main;
- location / {
- root ${esc_basepath}/dist; # static file directory
- index index.html index.html;
- }
- location /dolphinscheduler {
- proxy_pass $2; # interface address
- proxy_set_header Host $E_host;
- proxy_set_header X-Real-IP $E_remote_addr;
- proxy_set_header x_real_ipP $E_remote_addr;
- proxy_set_header remote_addr $E_remote_addr;
- proxy_set_header X-Forwarded-For $E_proxy_add_x_forwarded_for;
- proxy_http_version 1.1;
- proxy_connect_timeout 300s;
- proxy_read_timeout 300s;
- proxy_send_timeout 300s;
- proxy_set_header Upgrade $E_http_upgrade;
- proxy_set_header Connection "upgrade";
- }
- #error_page 404 /404.html;
- # redirect server error pages to the static page /50x.html
- #
- error_page 500 502 503 504 /50x.html;
- location = /50x.html {
- root /usr/share/nginx/html;
- }
- }
- " >> /etc/nginx/conf.d/dolphinscheduler.conf
-
-}
-
-ubuntu(){
- # update source
- apt-get update
-
- # install nginx
- apt-get install -y nginx
-
- # config nginx
- dolphinschedulerConf $1 $2
-
- # startup nginx
- /etc/init.d/nginx start
- sleep 1
- if [ $? -ne 0 ];then
- /etc/init.d/nginx start
- fi
- nginx -s reload
-}
-
-centos7(){
-
- rpm -Uvh
http://nginx.org/packages/centos/7/noarch/RPMS/nginx-release-centos-7-0.el7.ngx.noarch.rpm
- yum install -y nginx
-
- # config nginx
- dolphinschedulerConf $1 $2
-
- # solve 0.0.0.0:8888 problem
- yum -y install policycoreutils-python
- semanage port -a -t http_port_t -p tcp $esc_proxy
-
- # open front access port
- firewall-cmd --zone=public --add-port=$esc_proxy/tcp --permanent
-
- # startup nginx
- systemctl start nginx
- sleep 1
- if [ $? -ne 0 ];then
- systemctl start nginx
- fi
- nginx -s reload
-
- # set SELinux parameters
- sed -i "s/SELINUX=enforcing/SELINUX=disabled/g" /etc/selinux/config
- # temporary effect
- setenforce 0
-
-}
-
-
-centos6(){
-
- rpm -ivh
http://nginx.org/packages/centos/6/noarch/RPMS/nginx-release-centos-6-0.el6.ngx.noarch.rpm
-
- # install nginx
- yum install nginx -y
-
- # config nginx
- dolphinschedulerConf $1 $2
-
- # startup nginx
- /etc/init.d/nginx start
- sleep 1
- if [ $? -ne 0 ];then
- /etc/init.d/nginx start
- fi
- nginx -s reload
-
- # set SELinux parameters
- sed -i "s/SELINUX=enforcing/SELINUX=disabled/g" /etc/selinux/config
-
- # temporary effect
- setenforce 0
-
-}
-
-function main(){
- echo "Welcome to thedolphinscheduler front-end deployment script, which
is currently only supported by front-end deployment scripts : CentOS and Ubuntu"
- echo "Please execute in the dolphinscheduler-ui directory"
-
- #To be compatible with MacOS and Linux
- if [[ "$OSTYPE" == "darwin"* ]]; then
- # Mac OSX
- echo "Easy Scheduler ui install not support Mac OSX operating
system"
- exit 1
- elif [[ "$OSTYPE" == "linux-gnu" ]]; then
- # linux
- echo "linux"
- elif [[ "$OSTYPE" == "cygwin" ]]; then
- # POSIX compatibility layer and Linux environment emulation for
Windows
- echo "Easy Scheduler ui not support Windows operating system"
- exit 1
- elif [[ "$OSTYPE" == "msys" ]]; then
- # Lightweight shell and GNU utilities compiled for Windows
(part of MinGW)
- echo "Easy Scheduler ui not support Windows operating system"
- exit 1
- elif [[ "$OSTYPE" == "win32" ]]; then
- echo "Easy Scheduler ui not support Windows operating system"
- exit 1
- elif [[ "$OSTYPE" == "freebsd"* ]]; then
- # ...
- echo "freebsd"
- else
- # Unknown.
- echo "Operating system unknown, please tell us(submit issue)
for better service"
- exit 1
- fi
-
-
- # config front-end access ports
- read -p "Please enter the nginx proxy port, do not enter, the default
is 8888 :" esc_proxy_port
- if [ -z "${esc_proxy_port}" ];then
- esc_proxy_port="8888"
- fi
-
- read -p "Please enter the api server proxy ip, you must enter, for
example: 192.168.xx.xx :" esc_api_server_ip
- if [ -z "${esc_api_server_ip}" ];then
- echo "api server proxy ip can not be empty."
- exit 1
- fi
-
- read -p "Please enter the api server proxy port, do not enter, the
default is 12345:" esc_api_server_port
- if [ -z "${esc_api_server_port}" ];then
- esc_api_server_port="12345"
- fi
-
- # api server backend address
- esc_api_server="http://$esc_api_server_ip:$esc_api_server_port";
-
- # local ip address
- esc_ipaddr=$(ip a | grep inet | grep -v inet6 | grep -v 127 | sed 's/^[
\t]*//g' | cut -d ' ' -f2 | head -n 1 | awk -F '/' '{print $1}')
-
- # Prompt message
- menu
-
- read -p "Please enter the installation number(1|2|3|4)：" num
-
- case $num in
- 1)
- centos6 ${esc_proxy_port} ${esc_api_server}
- ;;
- 2)
- centos7 ${esc_proxy_port} ${esc_api_server}
- ;;
- 3)
- ubuntu ${esc_proxy_port} ${esc_api_server}
- ;;
- 4)
- echo $"Usage :sh $0"
- exit 1
- ;;
- *)
- echo $"Usage :sh $0"
- exit 1
- esac
- echo "Please visit the browser：http://${esc_ipaddr}:${esc_proxy_port}";
-
-}
-
-main
diff --git a/dolphinscheduler-ui/pom.xml b/dolphinscheduler-ui/pom.xml
index fe71564..56753e7 100644
--- a/dolphinscheduler-ui/pom.xml
+++ b/dolphinscheduler-ui/pom.xml
@@ -29,8 +29,8 @@
<name>${project.artifactId}</name>
<properties>
- <node.version>v12.12.0</node.version>
- <npm.version>6.11.3</npm.version>
+ <node.version>v12.20.2</node.version>
+ <npm.version>6.14.11</npm.version>
<sonar.sources>src</sonar.sources>
</properties>
<profiles>
@@ -144,63 +144,6 @@
</build>
</profile>
- <profile>
- <id>nginx</id>
- <build>
- <plugins>
- <plugin>
- <groupId>com.github.eirslett</groupId>
- <artifactId>frontend-maven-plugin</artifactId>
- <version>${frontend-maven-plugin.version}</version>
- <executions>
- <execution>
- <id>install node and npm</id>
- <goals>
- <goal>install-node-and-npm</goal>
- </goals>
- <configuration>
- <nodeVersion>${node.version}</nodeVersion>
- <npmVersion>${npm.version}</npmVersion>
- </configuration>
- </execution>
- <execution>
- <id>npm install node-sass --unsafe-perm</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <phase>generate-resources</phase>
- <configuration>
- <arguments>install node-sass --unsafe-perm</arguments>
- </configuration>
- </execution>
- <execution>
- <id>npm install</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <phase>generate-resources</phase>
- <configuration>
- <arguments>install</arguments>
- </configuration>
- </execution>
- <execution>
- <id>npm run build</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <configuration>
- <arguments>run build</arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- </build>
- </profile>
-
-
</profiles>
-
</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2a232c9..97c7125 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,8 +60,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<curator.version>4.3.0</curator.version>
- <spring.version>5.1.18.RELEASE</spring.version>
- <spring.boot.version>2.1.17.RELEASE</spring.boot.version>
+ <spring.version>5.1.19.RELEASE</spring.version>
+ <spring.boot.version>2.1.18.RELEASE</spring.boot.version>
<java.version>1.8</java.version>
<logback.version>1.2.3</logback.version>
<hadoop.version>2.7.3</hadoop.version>
diff --git a/tools/dependencies/known-dependencies.txt
b/tools/dependencies/known-dependencies.txt
index 14d1674..f6ee08e 100755
--- a/tools/dependencies/known-dependencies.txt
+++ b/tools/dependencies/known-dependencies.txt
@@ -75,7 +75,7 @@ hadoop-yarn-client-2.7.3.jar
hadoop-yarn-common-2.7.3.jar
hadoop-yarn-server-common-2.7.3.jar
hamcrest-core-1.3.jar
-hibernate-validator-6.0.20.Final.jar
+hibernate-validator-6.0.21.Final.jar
hive-common-2.1.0.jar
hive-jdbc-2.1.0.jar
hive-metastore-2.1.0.jar
@@ -87,7 +87,7 @@ hive-storage-api-2.1.0.jar
htrace-core-3.1.0-incubating.jar
httpclient-4.4.1.jar
httpcore-4.4.1.jar
-httpmime-4.5.12.jar
+httpmime-4.5.13.jar
j2objc-annotations-1.1.jar
jackson-annotations-2.10.5.jar
jackson-core-2.10.5.jar
@@ -122,21 +122,21 @@ jersey-server-1.9.jar
jets3t-0.9.0.jar
jettison-1.1.jar
jetty-6.1.26.jar
-jetty-continuation-9.4.31.v20200723.jar
-jetty-http-9.4.31.v20200723.jar
-jetty-io-9.4.31.v20200723.jar
-jetty-security-9.4.31.v20200723.jar
-jetty-server-9.4.31.v20200723.jar
-jetty-servlet-9.4.31.v20200723.jar
-jetty-servlets-9.4.31.v20200723.jar
+jetty-continuation-9.4.33.v20201020.jar
+jetty-http-9.4.33.v20201020.jar
+jetty-io-9.4.33.v20201020.jar
+jetty-security-9.4.33.v20201020.jar
+jetty-server-9.4.33.v20201020.jar
+jetty-servlet-9.4.33.v20201020.jar
+jetty-servlets-9.4.33.v20201020.jar
jetty-util-6.1.26.jar
-jetty-util-9.4.31.v20200723.jar
-jetty-webapp-9.4.31.v20200723.jar
-jetty-xml-9.4.31.v20200723.jar
+jetty-util-9.4.33.v20201020.jar
+jetty-webapp-9.4.33.v20201020.jar
+jetty-xml-9.4.33.v20201020.jar
jline-0.9.94.jar
jna-4.5.2.jar
jna-platform-4.5.2.jar
-joda-time-2.10.6.jar
+joda-time-2.10.8.jar
jpam-1.1.jar
jsch-0.1.42.jar
jsp-api-2.1.jar
@@ -177,7 +177,7 @@ mybatis-plus-core-3.2.0.jar
mybatis-plus-extension-3.2.0.jar
mybatis-spring-2.0.2.jar
netty-3.6.2.Final.jar
-netty-all-4.1.52.Final.jar
+netty-all-4.1.53.Final.jar
opencsv-2.3.jar
oshi-core-3.9.1.jar
paranamer-2.3.jar
@@ -205,27 +205,27 @@ slf4j-api-1.7.5.jar
snakeyaml-1.23.jar
snappy-0.2.jar
snappy-java-1.0.4.1.jar
-spring-aop-5.1.18.RELEASE.jar
-spring-beans-5.1.18.RELEASE.jar
-spring-boot-2.1.17.RELEASE.jar
-spring-boot-autoconfigure-2.1.17.RELEASE.jar
-spring-boot-starter-2.1.17.RELEASE.jar
-spring-boot-starter-aop-2.1.17.RELEASE.jar
-spring-boot-starter-jdbc-2.1.17.RELEASE.jar
-spring-boot-starter-jetty-2.1.17.RELEASE.jar
-spring-boot-starter-json-2.1.17.RELEASE.jar
-spring-boot-starter-logging-2.1.17.RELEASE.jar
-spring-boot-starter-web-2.1.17.RELEASE.jar
-spring-context-5.1.18.RELEASE.jar
-spring-core-5.1.18.RELEASE.jar
-spring-expression-5.1.18.RELEASE.jar
-spring-jcl-5.1.18.RELEASE.jar
-spring-jdbc-5.1.18.RELEASE.jar
+spring-aop-5.1.19.RELEASE.jar
+spring-beans-5.1.19.RELEASE.jar
+spring-boot-2.1.18.RELEASE.jar
+spring-boot-autoconfigure-2.1.18.RELEASE.jar
+spring-boot-starter-2.1.18.RELEASE.jar
+spring-boot-starter-aop-2.1.18.RELEASE.jar
+spring-boot-starter-jdbc-2.1.18.RELEASE.jar
+spring-boot-starter-jetty-2.1.18.RELEASE.jar
+spring-boot-starter-json-2.1.18.RELEASE.jar
+spring-boot-starter-logging-2.1.18.RELEASE.jar
+spring-boot-starter-web-2.1.18.RELEASE.jar
+spring-context-5.1.19.RELEASE.jar
+spring-core-5.1.19.RELEASE.jar
+spring-expression-5.1.19.RELEASE.jar
+spring-jcl-5.1.19.RELEASE.jar
+spring-jdbc-5.1.19.RELEASE.jar
spring-plugin-core-1.2.0.RELEASE.jar
spring-plugin-metadata-1.2.0.RELEASE.jar
-spring-tx-5.1.18.RELEASE.jar
-spring-web-5.1.18.RELEASE.jar
-spring-webmvc-5.1.18.RELEASE.jar
+spring-tx-5.1.19.RELEASE.jar
+spring-web-5.1.19.RELEASE.jar
+spring-webmvc-5.1.19.RELEASE.jar
springfox-core-2.9.2.jar
springfox-schema-2.9.2.jar
springfox-spi-2.9.2.jar
