diff --git a/README.md b/README.md index b618e4d4cf..5c982c283e 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 f11fcf2035..39c0892eaa 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -76,8 +76,8 @@ DolphinScheduler的工作计划： - src/main/assembly/dolphinscheduler-binary.xml + src/main/assembly/dolphinscheduler-bin.xml true @@ -100,63 +100,6 @@ - - nginx - - - - maven-assembly-plugin - - - dolphinscheduler-nginx - package - - single - - - - - src/main/assembly/dolphinscheduler-nginx.xml - - true - - - - - src - package - - single - - - - src/main/assembly/dolphinscheduler-src.xml - - true - - - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - verify - - jar-no-fork - - - - - - - - - rpmbuild @@ -429,5 +372,4 @@ - \ No newline at end of file diff --git a/dolphinscheduler-dist/release-docs/LICENSE b/dolphinscheduler-dist/release-docs/LICENSE index ae2af97f27..5358f5ef74 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 1ef5c2e79d..e72402b8af 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"> - dolphinscheduler-bin + bin tar.gz true - ${project.build.finalName}-dolphinscheduler-bin + ${project.build.finalName}-bin - ${basedir}/../dolphinscheduler-alert/src/main/resources @@ -36,20 +35,22 @@ **/*.json **/*.ftl - ./conf + conf - - - src/main/resources + ${basedir}/../dolphinscheduler-api/src/main/resources **/*.properties **/*.xml **/*.json + + application.properties + conf + ${basedir}/../dolphinscheduler-common/src/main/resources @@ -59,6 +60,7 @@ conf + ${basedir}/../dolphinscheduler-common/src/main/resources/bin @@ -67,6 +69,7 @@ 755 bin + ${basedir}/../dolphinscheduler-dao/src/main/resources @@ -74,20 +77,12 @@ **/*.xml **/*.json + + org/apache/dolphinscheduler/dao/mapper/*.xml + conf - - ${basedir}/../dolphinscheduler-api/src/main/resources - - **/*.properties - **/*.xml - **/*.json - - conf - - - ${basedir}/../dolphinscheduler-server/src/main/resources @@ -99,9 +94,8 @@ conf - - ${basedir}/../dolphinscheduler-dao/src/main/resources + ${basedir}/../dolphinscheduler-service/src/main/resources **/*.properties **/*.xml @@ -110,22 +104,16 @@ conf - - - - ${basedir}/../dolphinscheduler-service/src/main/resources + src/main/resources **/*.properties **/*.xml **/*.json - **/*.yml conf - - ${basedir}/../dolphinscheduler-server/target/dolphinscheduler-server-${project.version} @@ -151,7 +139,6 @@ . - ${basedir}/../dolphinscheduler-dist/target/dolphinscheduler-dist-${project.version} 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 d5aa0205f2..0000000000 --- a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-nginx.xml +++ /dev/null @@ -1,245 +0,0 @@ - - - - dolphinscheduler-nginx - - tar.gz - - true - ${project.build.finalName}-dolphinscheduler-bin - - - - - ${basedir}/../dolphinscheduler-alert/src/main/resources - - **/*.properties - **/*.xml - **/*.json - **/*.ftl - - ./conf - - - - - - src/main/resources - - **/*.properties - **/*.xml - **/*.json - - conf - - - ${basedir}/../dolphinscheduler-common/src/main/resources - - **/*.properties - **/*.xml - **/*.json - - conf - - - ${basedir}/../dolphinscheduler-common/src/main/resources/bin - - *.* - - 755 - bin - - - ${basedir}/../dolphinscheduler-dao/src/main/resources - - **/*.properties - **/*.xml - **/*.json - - conf - - - ${basedir}/../dolphinscheduler-api/src/main/resources - - **/*.properties - **/*.xml - **/*.json - - conf - - - - - - ${basedir}/../dolphinscheduler-server/src/main/resources - - **/*.properties - **/*.xml - **/*.json - config/*.* - - conf - - - - - ${basedir}/../dolphinscheduler-dao/src/main/resources - - **/*.properties - **/*.xml - **/*.json - **/*.yml - - conf - - - - - - - ${basedir}/../dolphinscheduler-service/src/main/resources - - **/*.properties - **/*.xml - **/*.json - **/*.yml - - conf - - - - - - ${basedir}/../dolphinscheduler-server/target/dolphinscheduler-server-${project.version} - - **/*.* - - . - - - - ${basedir}/../dolphinscheduler-api/target/dolphinscheduler-api-${project.version} - - **/*.* - - . - - - - ${basedir}/../dolphinscheduler-alert/target/dolphinscheduler-alert-${project.version} - - **/*.* - - . - - - - ${basedir}/../dolphinscheduler-dist/target/dolphinscheduler-dist-${project.version} - - **/*.* - - . - - - - ${basedir}/../dolphinscheduler-ui/dist - - **/*.* - - ./ui/dist - - - - ${basedir}/../dolphinscheduler-ui - - install-dolphinscheduler-ui.sh - - ./ui - - - - ${basedir}/../sql - - **/* - - ./sql - - - - ${basedir}/../script - - *.* - - ./script - - - - ${basedir}/../script - - env/*.* - - ./conf - - - - ${basedir}/../script - - start-all.sh - stop-all.sh - dolphinscheduler-daemon.sh - status-all.sh - - ./bin - - - - ${basedir}/.././ - - *.sh - *.py - DISCLAIMER - - . - - - - ${basedir}/release-docs - true - - **/* - - . - - - - - - - lib - true - - javax.servlet:servlet-api - org.eclipse.jetty.aggregate:jetty-all - org.slf4j:slf4j-log4j12 - - - - \ 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 1e00dec021..e675cfb2ba 100644 --- a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-src.xml +++ b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-src.xml @@ -16,72 +16,72 @@ --> - src - - zip - - true - ${project.build.finalName}-src-release + 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"> + src + + tar.gz + + true + ${project.build.finalName}-src - - - ${basedir}/../ - true - - **/* - - - - **/.github/** - .travis.yml + + + ${basedir}/../ + true + + **/* + + + + **/.github/** + .travis.yml - - **/target/** - **/*.class - **/*.jar - **/*.war - **/*.zip - **/*.tar - **/*.tar.gz + + **/target/** + **/*.class + **/*.jar + **/*.war + **/*.zip + **/*.tar + **/*.tar.gz - - release.properties - **/pom.xml.releaseBackup - **/cobertura.ser - *.gpg + + release.properties + **/pom.xml.releaseBackup + **/cobertura.ser + *.gpg - - **/dolphinscheduler-ui/dist/** - **/dolphinscheduler-ui/node/** - **/dolphinscheduler-ui/node_modules/** + + **/dolphinscheduler-ui/dist/** + **/dolphinscheduler-ui/node/** + **/dolphinscheduler-ui/node_modules/** - - **/.settings/** - **/.project - **/.classpath + + **/.settings/** + **/.project + **/.classpath - - **/.idea/** - **/*.ipr - **/*.iml - **/*.iws + + **/.idea/** + **/*.ipr + **/*.iml + **/*.iws - - **/logs/** - **/*.log - **/*.doc - **/*.cache - **/*.diff - **/*.patch - **/*.tmp + + **/logs/** + **/*.log + **/*.doc + **/*.cache + **/*.diff + **/*.patch + **/*.tmp - - **/.DS_Store - **/Thumbs.db - - - + + **/.DS_Store + **/Thumbs.db + + + \ No newline at end of file diff --git a/dolphinscheduler-ui/.env b/dolphinscheduler-ui/.env index e676be6059..bd768bcd47 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 ea250330ad..0513789812 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 b908c36da4..0000000000 --- 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 <> /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 fe715648e7..56753e7744 100644 --- a/dolphinscheduler-ui/pom.xml +++ b/dolphinscheduler-ui/pom.xml @@ -29,8 +29,8 @@ ${project.artifactId} - v12.12.0 - 6.11.3 + v12.20.2 + 6.14.11 src @@ -144,63 +144,6 @@ - - nginx - - - - com.github.eirslett - frontend-maven-plugin - ${frontend-maven-plugin.version} - - - install node and npm - - install-node-and-npm - - - ${node.version} - ${npm.version} - - - - npm install node-sass --unsafe-perm - - npm - - generate-resources - - install node-sass --unsafe-perm - - - - npm install - - npm - - generate-resources - - install - - - - npm run build - - npm - - - run build - - - - - - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2a232c9eba..97c71257d8 100644 --- a/pom.xml +++ b/pom.xml @@ -60,8 +60,8 @@ UTF-8 UTF-8 4.3.0 - 5.1.18.RELEASE - 2.1.17.RELEASE + 5.1.19.RELEASE + 2.1.18.RELEASE 1.8 1.2.3 2.7.3 diff --git a/tools/dependencies/known-dependencies.txt b/tools/dependencies/known-dependencies.txt index 14d167481c..f6ee08e39f 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