github
/
DolphinScheduler
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

[Improve][common] code clean in the common module (#9435)

3.0.0/version-upgrade
Kerwin 3 years ago committed by GitHub
parent
5d5125d507
commit
4f2b9ac886
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 32 additions and 115 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      docs/docs/en/faq.md
  2. 5
      docs/docs/zh/faq.md
  3. 44
      dolphinscheduler-common/pom.xml
  4. 10
      dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-all/pom.xml
  5. 10
      dolphinscheduler-datasource-plugin/pom.xml
  6. 8
      dolphinscheduler-dist/src/main/assembly/dolphinscheduler-bin.xml
  7. 4
      dolphinscheduler-standalone-server/src/main/assembly/dolphinscheduler-standalone-server.xml
  8. 61
      pom.xml

5
docs/docs/en/faq.md
Unescape View File

@ -306,11 +306,10 @@ A: 1, Create deployment user and hosts mapping, please refer 1.3 part of [cluste
​ 3, Copy the deployment directory from worker server that has already deployed ​ 3, Copy the deployment directory from worker server that has already deployed
​ 4, Go to bin dir, then start worker server and logger server ​ 4, Go to bin dir, then start worker server
``` ```
./dolphinscheduler-daemon.sh start worker-server ./dolphinscheduler-daemon.sh start worker-server
./dolphinscheduler-daemon.sh start logger-server
``` ```
--- ---
@ -602,7 +601,7 @@ A：By deploying different worker in different yarn clusters，the steps are as
2. Changing `yarn.application.status.address` to current emr's yarn url in the `conf/common.properties` 2. Changing `yarn.application.status.address` to current emr's yarn url in the `conf/common.properties`
3. Execute command `bin/dolphinscheduler-daemon.sh start worker-server` and `bin/dolphinscheduler-daemon.sh start logger-server` to start worker-server and logger-server 3. Execute command `bin/dolphinscheduler-daemon.sh start worker-server` to start worker-server
--- ---

5
docs/docs/zh/faq.md
Unescape View File

@ -290,10 +290,9 @@ A： 1，参考官网[部署文档](https://dolphinscheduler.apache.org/zh-cn/do
​ 3，复制正在运行的服务器上的部署目录到新机器的同样的部署目录下 ​ 3，复制正在运行的服务器上的部署目录到新机器的同样的部署目录下
​ 4，到 bin 下，启动 worker server 和 logger server ​ 4，到 bin 下，启动 worker server
``` ```
./dolphinscheduler-daemon.sh start worker-server ./dolphinscheduler-daemon.sh start worker-server
./dolphinscheduler-daemon.sh start logger-server
``` ```
--- ---
@ -582,7 +581,7 @@ A：将Worker节点分别部署至多个Yarn集群，步骤如下（例如AWS EM
2. 将 `conf/common.properties` 中的 `yarn.application.status.address` 修改为当前集群的 Yarn 的信息 2. 将 `conf/common.properties` 中的 `yarn.application.status.address` 修改为当前集群的 Yarn 的信息
3. 通过 `bin/dolphinscheduler-daemon.sh start worker-server` 和 `bin/dolphinscheduler-daemon.sh start logger-server` 分别启动 worker-server 和 logger-server 3. 通过 `bin/dolphinscheduler-daemon.sh start worker-server` 启动 worker-server
--- ---

44
dolphinscheduler-common/pom.xml
Unescape View File

@ -274,12 +274,6 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.amazonaws</groupId> <groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId> <artifactId>aws-java-sdk-s3</artifactId>
@ -496,8 +490,6 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
@ -511,45 +503,9 @@
<artifactId>oshi-core</artifactId> <artifactId>oshi-core</artifactId>
</dependency> </dependency>
<dependency>
<groupId>ru.yandex.clickhouse</groupId>
<artifactId>clickhouse-jdbc</artifactId>
<exclusions>
<exclusion>
<artifactId>com.fasterxml.jackson.core</artifactId>
<groupId>jackson-core</groupId>
</exclusion>
<exclusion>
<artifactId>com.fasterxml.jackson.core</artifactId>
<groupId>jackson-databind</groupId>
</exclusion>
<exclusion>
<artifactId>jaxb-api</artifactId>
<groupId>javax.xml.bind</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<exclusions>
<exclusion>
<artifactId>azure-keyvault</artifactId>
<groupId>com.microsoft.azure</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-jdbc</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-annotation</artifactId> <artifactId>mybatis-plus-annotation</artifactId>
<version>${mybatis-plus.version}</version>
</dependency> </dependency>
<dependency> <dependency>

10
dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-all/pom.xml
Unescape View File

@ -31,42 +31,52 @@
<dependency> <dependency>
<groupId>org.apache.dolphinscheduler</groupId> <groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-clickhouse</artifactId> <artifactId>dolphinscheduler-datasource-clickhouse</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.dolphinscheduler</groupId> <groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-db2</artifactId> <artifactId>dolphinscheduler-datasource-db2</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.dolphinscheduler</groupId> <groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-hive</artifactId> <artifactId>dolphinscheduler-datasource-hive</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.dolphinscheduler</groupId> <groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-mysql</artifactId> <artifactId>dolphinscheduler-datasource-mysql</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.dolphinscheduler</groupId> <groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-oracle</artifactId> <artifactId>dolphinscheduler-datasource-oracle</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.dolphinscheduler</groupId> <groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-postgresql</artifactId> <artifactId>dolphinscheduler-datasource-postgresql</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.dolphinscheduler</groupId> <groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-sqlserver</artifactId> <artifactId>dolphinscheduler-datasource-sqlserver</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.dolphinscheduler</groupId> <groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-redshift</artifactId> <artifactId>dolphinscheduler-datasource-redshift</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.dolphinscheduler</groupId> <groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-spark</artifactId> <artifactId>dolphinscheduler-datasource-spark</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.dolphinscheduler</groupId> <groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-presto</artifactId> <artifactId>dolphinscheduler-datasource-presto</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

10
dolphinscheduler-datasource-plugin/pom.xml
Unescape View File

@ -42,4 +42,14 @@
<module>dolphinscheduler-datasource-all</module> <module>dolphinscheduler-datasource-all</module>
<module>dolphinscheduler-datasource-redshift</module> <module>dolphinscheduler-datasource-redshift</module>
</modules> </modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-hive</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project> </project>

8
dolphinscheduler-dist/src/main/assembly/dolphinscheduler-bin.xml vendored
Unescape View File

@ -17,7 +17,8 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0" <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd"> <id>bin</id> xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
<id>bin</id>
<formats> <formats>
<format>tar.gz</format> <format>tar.gz</format>
</formats> </formats>
@ -45,11 +46,6 @@
<outputDirectory>worker-server</outputDirectory> <outputDirectory>worker-server</outputDirectory>
</fileSet> </fileSet>
<fileSet>
<directory>${basedir}/../dolphinscheduler-log-server/target/logger-server</directory>
<outputDirectory>logger-server</outputDirectory>
</fileSet>
<fileSet> <fileSet>
<directory>${basedir}/../dolphinscheduler-standalone-server/target/standalone-server</directory> <directory>${basedir}/../dolphinscheduler-standalone-server/target/standalone-server</directory>
<outputDirectory>standalone-server</outputDirectory> <outputDirectory>standalone-server</outputDirectory>

4
dolphinscheduler-standalone-server/src/main/assembly/dolphinscheduler-standalone-server.xml
Unescape View File

@ -41,10 +41,6 @@
<directory>${basedir}/../dolphinscheduler-worker/target/worker-server/libs</directory> <directory>${basedir}/../dolphinscheduler-worker/target/worker-server/libs</directory>
<outputDirectory>libs/worker-server</outputDirectory> <outputDirectory>libs/worker-server</outputDirectory>
</fileSet> </fileSet>
<fileSet>
<directory>${basedir}/../dolphinscheduler-log-server/target/logger-server/libs</directory>
<outputDirectory>libs/logger-server</outputDirectory>
</fileSet>
<fileSet> <fileSet>
<directory>${basedir}/src/main/resources</directory> <directory>${basedir}/src/main/resources</directory>

61
pom.xml
Unescape View File

@ -179,6 +179,12 @@
<artifactId>mybatis-plus</artifactId> <artifactId>mybatis-plus</artifactId>
<version>${mybatis-plus.version}</version> <version>${mybatis-plus.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-annotation</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
<!-- quartz--> <!-- quartz-->
<dependency> <dependency>
<groupId>org.quartz-scheduler</groupId> <groupId>org.quartz-scheduler</groupId>
@ -386,11 +392,6 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-plugin</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.dolphinscheduler</groupId> <groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-all</artifactId> <artifactId>dolphinscheduler-datasource-all</artifactId>
@ -401,56 +402,6 @@
<artifactId>dolphinscheduler-datasource-api</artifactId> <artifactId>dolphinscheduler-datasource-api</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-clickhouse</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-db2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-hive</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-mysql</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-oracle</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-postgresql</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-sqlserver</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-redshift</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-spark</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-presto</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.dolphinscheduler</groupId> <groupId>org.apache.dolphinscheduler</groupId>

Write Preview
Loading…
Cancel
Save