This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a commit to branch 1.3.6-prepare
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/1.3.6-prepare by this push:
new 80f9215 [1.3.6-prepare][Build] Optimize long release name and remove
unused nginx release (#5187)
80f9215 is described below
commit 80f92155616650d8af4cc7dda04cdbaf21026e9c
Author: Shiwen Cheng <[email protected]>
AuthorDate: Wed Mar 31 20:47:02 2021 +0800
[1.3.6-prepare][Build] Optimize long release name and remove unused nginx
release (#5187)
* [1.3.6-prepare][Build] Optimize long release name and remove unused nginx
release
* [1.3.6-prepare][Build] Upgrade spring boot version
* [1.3.6-prepare][Build] Support page /swagger-ui.html
* [1.3.6-prepare][Improvement] Improve code style
---
README.md | 4 +-
README_zh_CN.md | 4 +-
.../DOLPHIN/1.3.6/configuration/dolphin-common.xml | 1 -
docker/build/Dockerfile | 4 +-
.../application-api.properties.tpl | 5 +-
docker/build/hooks/build | 4 +-
docker/build/hooks/build.bat | 4 +-
.../api/configuration/AppConfiguration.java | 17 +-
.../src/main/resources/application-api.properties | 5 +-
.../main/resources/i18n/messages_zh_CN.properties | 2 +-
dolphinscheduler-dist/pom.xml | 60 +-----
...heduler-binary.xml => dolphinscheduler-bin.xml} | 42 ++--
.../src/main/assembly/dolphinscheduler-nginx.xml | 236 ---------------------
.../src/main/assembly/dolphinscheduler-src.xml | 4 +-
dolphinscheduler-ui/.env | 7 +-
dolphinscheduler-ui/build/webpack.config.dev.js | 2 +-
dolphinscheduler-ui/install-dolphinscheduler-ui.sh | 234 --------------------
dolphinscheduler-ui/pom.xml | 62 +-----
pom.xml | 13 +-
.../postgresql/dolphinscheduler_ddl.sql | 3 +-
tools/dependencies/known-dependencies.txt | 86 ++++----
21 files changed, 108 insertions(+), 691 deletions(-)
diff --git a/README.md b/README.md
index ede3de1..318d256 100644
--- a/README.md
+++ b/README.md
@@ -70,8 +70,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 31f632f..6d3e8d2 100644
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@@ -76,8 +76,8 @@ DolphinScheduler的工作计划：<a
href="https://github.com/apache/incubator-d
制品:
```
-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/ambari_plugin/common-services/DOLPHIN/1.3.6/configuration/dolphin-common.xml
b/ambari_plugin/common-services/DOLPHIN/1.3.6/configuration/dolphin-common.xml
index 609f061..f0dafab 100644
---
a/ambari_plugin/common-services/DOLPHIN/1.3.6/configuration/dolphin-common.xml
+++
b/ambari_plugin/common-services/DOLPHIN/1.3.6/configuration/dolphin-common.xml
@@ -1,4 +1,3 @@
-
<!--
~ Licensed to the Apache Software Foundation (ASF) under one or more
~ contributor license agreements. See the NOTICE file distributed with
diff --git a/docker/build/Dockerfile b/docker/build/Dockerfile
index 3c96b25..774e9cf 100644
--- a/docker/build/Dockerfile
+++ b/docker/build/Dockerfile
@@ -40,8 +40,8 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/* /tmp/*
# 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 ac173a6..a8471c4 100644
--- a/docker/build/conf/dolphinscheduler/application-api.properties.tpl
+++ b/docker/build/conf/dolphinscheduler/application-api.properties.tpl
@@ -35,9 +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
-server.jetty.max-http-post-size=5000000
+# max http post size
+server.jetty.max-http-form-post-size=5000000
+# 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 3cac103..0590761 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 77db088..d4d538b 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 f05cda4..e34037c 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
@@ -19,17 +19,21 @@ package org.apache.dolphinscheduler.api.configuration;
import org.apache.dolphinscheduler.api.interceptor.LocaleChangeInterceptor;
import org.apache.dolphinscheduler.api.interceptor.LoginHandlerInterceptor;
+import java.util.Locale;
+
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
import org.springframework.web.servlet.LocaleResolver;
-import org.springframework.web.servlet.config.annotation.*;
+import
org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import
org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import
org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import org.springframework.web.servlet.i18n.CookieLocaleResolver;
-import java.util.Locale;
-
/**
* application configuration
*/
@@ -82,13 +86,18 @@ public class AppConfiguration implements WebMvcConfigurer {
// i18n
registry.addInterceptor(localeChangeInterceptor());
// login
-
registry.addInterceptor(loginInterceptor()).addPathPatterns(LOGIN_INTERCEPTOR_PATH_PATTERN).excludePathPatterns(LOGIN_PATH_PATTERN,"/swagger-resources/**",
"/webjars/**", "/v2/**", "/doc.html", "*.html", "/ui/**");
+ registry.addInterceptor(loginInterceptor())
+ .addPathPatterns(LOGIN_INTERCEPTOR_PATH_PATTERN)
+ .excludePathPatterns(LOGIN_PATH_PATTERN,
+ "/swagger-resources/**", "/webjars/**", "/v2/**",
+ "/doc.html", "/swagger-ui.html", "*.html", "/ui/**");
}
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
+
registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
registry.addResourceHandler("/ui/**").addResourceLocations("file:ui/");
}
diff --git a/dolphinscheduler-api/src/main/resources/application-api.properties
b/dolphinscheduler-api/src/main/resources/application-api.properties
index ac173a6..a8471c4 100644
--- a/dolphinscheduler-api/src/main/resources/application-api.properties
+++ b/dolphinscheduler-api/src/main/resources/application-api.properties
@@ -35,9 +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
-server.jetty.max-http-post-size=5000000
+# max http post size
+server.jetty.max-http-form-post-size=5000000
+# 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 9053b09..b491445 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 58deb43..bfa96bc 100644
--- a/dolphinscheduler-dist/pom.xml
+++ b/dolphinscheduler-dist/pom.xml
@@ -66,7 +66,7 @@
<configuration>
<descriptors>
-
<descriptor>src/main/assembly/dolphinscheduler-binary.xml</descriptor>
+
<descriptor>src/main/assembly/dolphinscheduler-bin.xml</descriptor>
</descriptors>
<appendAssemblyId>true</appendAssemblyId>
</configuration>
@@ -107,63 +107,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>
@@ -434,5 +377,4 @@
</profiles>
-
</project>
\ No newline at end of file
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 9201fe1..c0c75ea 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 end-->
<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>
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 f41151c..0000000
--- a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-nginx.xml
+++ /dev/null
@@ -1,236 +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>
-
- <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>
- </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..349f66c 100644
--- a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-src.xml
+++ b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-src.xml
@@ -21,10 +21,10 @@
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>
+ <format>tar.gz</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${project.build.finalName}-src-release</baseDirectory>
+ <baseDirectory>${project.build.finalName}-src</baseDirectory>
<fileSets>
<fileSet>
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 d443bf8..abcb70f 100644
--- a/dolphinscheduler-ui/build/webpack.config.dev.js
+++ b/dolphinscheduler-ui/build/webpack.config.dev.js
@@ -30,8 +30,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,
historyApiFallback: true,
disableHostCheck: 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 166ce74..71fbe15 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,64 +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>
diff --git a/pom.xml b/pom.xml
index 923226a..1a522fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,8 +58,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.5.RELEASE</spring.version>
- <spring.boot.version>2.1.3.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>
@@ -117,6 +117,7 @@
<servlet-api.version>2.5</servlet-api.version>
<swagger.version>1.9.3</swagger.version>
<springfox.version>2.9.2</springfox.version>
+ <swagger-models.version>1.5.24</swagger-models.version>
<skywalking.version>8.4.0</skywalking.version>
</properties>
@@ -540,6 +541,12 @@
</dependency>
<dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-models</artifactId>
+ <version>${swagger-models.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>swagger-bootstrap-ui</artifactId>
<version>${swagger.version}</version>
@@ -559,8 +566,6 @@
<pluginManagement>
<plugins>
-
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId>
diff --git a/sql/upgrade/1.3.6_schema/postgresql/dolphinscheduler_ddl.sql
b/sql/upgrade/1.3.6_schema/postgresql/dolphinscheduler_ddl.sql
index 860c8b2..17a8807 100644
--- a/sql/upgrade/1.3.6_schema/postgresql/dolphinscheduler_ddl.sql
+++ b/sql/upgrade/1.3.6_schema/postgresql/dolphinscheduler_ddl.sql
@@ -35,8 +35,7 @@ d//
delimiter ;
SELECT uc_dolphin_T_t_ds_worker_group_A_ip_list();
DROP FUNCTION IF EXISTS uc_dolphin_T_t_ds_worker_group_A_ip_list();
-delimiter ;
-- Add foreign key constraints for t_ds_task_instance --
+delimiter ;
ALTER TABLE t_ds_task_instance ADD CONSTRAINT foreign_key_instance_id FOREIGN
KEY(process_instance_id) REFERENCES t_ds_process_instance(id) ON DELETE CASCADE;
-
diff --git a/tools/dependencies/known-dependencies.txt
b/tools/dependencies/known-dependencies.txt
index 81f1710..64d4095 100755
--- a/tools/dependencies/known-dependencies.txt
+++ b/tools/dependencies/known-dependencies.txt
@@ -2,13 +2,13 @@ HikariCP-3.2.0.jar
activation-1.1.jar
ant-1.6.5.jar
aopalliance-1.0.jar
-apache-el-8.5.35.1.jar
+apache-el-8.5.54.jar
apacheds-i18n-2.0.0-M15.jar
apacheds-kerberos-codec-2.0.0-M15.jar
api-asn1-api-1.0.0-M20.jar
api-util-1.0.0-M20.jar
asm-3.1.jar
-aspectjweaver-1.9.2.jar
+aspectjweaver-1.9.6.jar
audience-annotations-0.5.0.jar
avro-1.7.4.jar
aws-java-sdk-1.7.4.jar
@@ -23,7 +23,7 @@ apm-springmvc-annotation-5.x-plugin-8.4.0.jar
apm-springmvc-annotation-commons-8.4.0.jar
apm-zookeeper-3.4.x-plugin-8.4.0.jar
bonecp-0.8.0.RELEASE.jar
-byte-buddy-1.9.10.jar
+byte-buddy-1.9.16.jar
classmate-1.4.0.jar
clickhouse-jdbc-0.1.52.jar
commons-cli-1.2.jar
@@ -53,7 +53,7 @@ datanucleus-rdbms-4.1.7.jar
derby-10.14.2.0.jar
druid-1.1.14.jar
fastjson-1.2.61.jar
-gson-2.8.5.jar
+gson-2.8.6.jar
guava-20.0.jar
guice-3.0.jar
guice-servlet-3.0.jar
@@ -74,7 +74,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.14.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
@@ -86,16 +86,16 @@ 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.7.jar
+httpmime-4.5.13.jar
jackson-annotations-2.9.10.jar
jackson-core-2.9.10.jar
jackson-core-asl-1.9.13.jar
jackson-databind-2.9.10.jar
-jackson-datatype-jdk8-2.9.8.jar
-jackson-datatype-jsr310-2.9.8.jar
+jackson-datatype-jdk8-2.9.10.jar
+jackson-datatype-jsr310-2.9.10.jar
jackson-jaxrs-1.9.13.jar
jackson-mapper-asl-1.9.13.jar
-jackson-module-parameter-names-2.9.8.jar
+jackson-module-parameter-names-2.9.10.jar
jackson-xc-1.9.13.jar
jamon-runtime-2.3.1.jar
java-xmlbuilder-0.4.jar
@@ -108,7 +108,7 @@ javax.servlet-api-3.1.0.jar
javolution-5.5.1.jar
jaxb-api-2.3.1.jar
jaxb-impl-2.2.3-1.jar
-jboss-logging-3.3.2.Final.jar
+jboss-logging-3.3.3.Final.jar
jdo-api-3.0.1.jar
jersey-client-1.9.jar
jersey-core-1.9.jar
@@ -118,21 +118,21 @@ jersey-server-1.9.jar
jets3t-0.9.0.jar
jettison-1.1.jar
jetty-6.1.26.jar
-jetty-continuation-9.4.14.v20181114.jar
-jetty-http-9.4.14.v20181114.jar
-jetty-io-9.4.14.v20181114.jar
-jetty-security-9.4.14.v20181114.jar
-jetty-server-9.4.14.v20181114.jar
-jetty-servlet-9.4.14.v20181114.jar
-jetty-servlets-9.4.14.v20181114.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.14.v20181114.jar
-jetty-webapp-9.4.14.v20181114.jar
-jetty-xml-9.4.14.v20181114.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.1.jar
+joda-time-2.10.8.jar
jpam-1.1.jar
jsch-0.1.42.jar
jsp-2.1-6.1.14.jar
@@ -141,7 +141,7 @@ jsp-api-2.1.jar
jsqlparser-2.1.jar
jsr305-3.0.0.jar
jta-1.1.jar
-jul-to-slf4j-1.7.25.jar
+jul-to-slf4j-1.7.30.jar
junit-4.12.jar
leveldbjni-all-1.8.jar
libfb303-0.9.3.jar
@@ -163,7 +163,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.33.Final.jar
+netty-all-4.1.53.Final.jar
opencsv-2.3.jar
oshi-core-3.5.0.jar
paranamer-2.3.jar
@@ -177,27 +177,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.5.RELEASE.jar
-spring-beans-5.1.5.RELEASE.jar
-spring-boot-2.1.3.RELEASE.jar
-spring-boot-autoconfigure-2.1.3.RELEASE.jar
-spring-boot-starter-2.1.3.RELEASE.jar
-spring-boot-starter-aop-2.1.3.RELEASE.jar
-spring-boot-starter-jdbc-2.1.3.RELEASE.jar
-spring-boot-starter-jetty-2.1.3.RELEASE.jar
-spring-boot-starter-json-2.1.3.RELEASE.jar
-spring-boot-starter-logging-2.1.3.RELEASE.jar
-spring-boot-starter-web-2.1.3.RELEASE.jar
-spring-context-5.1.5.RELEASE.jar
-spring-core-5.1.5.RELEASE.jar
-spring-expression-5.1.5.RELEASE.jar
-spring-jcl-5.1.5.RELEASE.jar
-spring-jdbc-5.1.5.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.5.RELEASE.jar
-spring-web-5.1.5.RELEASE.jar
-spring-webmvc-5.1.5.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
@@ -207,7 +207,7 @@ springfox-swagger-ui-2.9.2.jar
springfox-swagger2-2.9.2.jar
swagger-annotations-1.5.20.jar
swagger-bootstrap-ui-1.9.3.jar
-swagger-models-1.5.20.jar
+swagger-models-1.5.24.jar
skywalking-agent.jar
spring-commons-8.4.0.jar
tephra-api-0.6.0.jar
