Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DSIP-38] Optimize dependency tree #16838

Merged
merged 9 commits into from
Nov 26, 2024
Merged

[DSIP-38] Optimize dependency tree #16838

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
208636f
optimize dependency tree
SbloodyS Nov 25, 2024
98da150
optimize dependency tree
SbloodyS Nov 25, 2024
a04ee86
optimize dependency tree
SbloodyS Nov 25, 2024
92983b0
optimize dependency tree
SbloodyS Nov 25, 2024
da594f9
optimize dependency tree
SbloodyS Nov 25, 2024
f8fa194
optimize dependency tree
SbloodyS Nov 25, 2024
e725c38
optimize dependency tree
SbloodyS Nov 25, 2024
ad76b73
optimize dependency tree
SbloodyS Nov 26, 2024
24e9ba1
Merge branch 'dev' into improvement_16098
SbloodyS Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dolphinscheduler-alert/dolphinscheduler-alert-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-alert-all</artifactId>
<artifactId>dolphinscheduler-alert-api</artifactId>
</dependency>

<dependency>
Expand Down
7 changes: 7 additions & 0 deletions dolphinscheduler-api-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
<jackson.version>2.13.2</jackson.version>
<checkstyle.version>3.1.2</checkstyle.version>
<junit-pioneer.version>2.2.0</junit-pioneer.version>
<http.components.version>4.5.13</http.components.version>
</properties>

<dependencies>
Expand All @@ -74,6 +75,12 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>${http.components.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.testcontainers</groupId>
Expand Down
48 changes: 39 additions & 9 deletions dolphinscheduler-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,19 @@

<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-all</artifactId>
<artifactId>dolphinscheduler-common</artifactId>
ruanwenjun marked this conversation as resolved.
Show resolved Hide resolved
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-api</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-task-all</artifactId>
<artifactId>dolphinscheduler-task-api</artifactId>
</dependency>

<dependency>
Expand All @@ -86,7 +92,7 @@
</dependency>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-storage-all</artifactId>
<artifactId>dolphinscheduler-storage-api</artifactId>
</dependency>

<dependency>
Expand All @@ -100,13 +106,15 @@
</dependency>

<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-extract-alert</artifactId>
</dependency>

<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
</dependency>

<!--springboot-->
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -184,6 +192,20 @@
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-all</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-storage-all</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<!-- Python API's Gateway server -->
<dependency>
<groupId>net.sf.py4j</groupId>
Expand Down Expand Up @@ -228,10 +250,18 @@
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-datafactory</artifactId>
</dependency>

<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-extract-alert</artifactId>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<exclusions>
<exclusion>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
</exclusion>
</exclusions>
</dependency>

</dependencies>
<build>
<testResources>
Expand Down
3 changes: 1 addition & 2 deletions ...uler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AuditServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@
import org.apache.dolphinscheduler.dao.entity.AuditLog;
import org.apache.dolphinscheduler.dao.mapper.AuditLogMapper;

import org.apache.parquet.Strings;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
Expand All @@ -40,6 +38,7 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.base.Strings;

@Service
@Slf4j
Expand Down
2 changes: 1 addition & 1 deletion ...pi/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
import org.springframework.transaction.annotation.Transactional;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.facebook.presto.jdbc.internal.guava.base.Strings;
import com.google.common.base.Strings;

@Service
@Slf4j
Expand Down
3 changes: 1 addition & 2 deletions ...main/java/org/apache/dolphinscheduler/api/service/impl/WorkflowDefinitionServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@
import org.apache.dolphinscheduler.plugin.task.api.parameters.DependentParameters;
import org.apache.dolphinscheduler.plugin.task.api.parameters.SqlParameters;
import org.apache.dolphinscheduler.plugin.task.api.utils.TaskTypeUtils;
import org.apache.dolphinscheduler.plugin.task.sql.SqlTaskChannelFactory;
import org.apache.dolphinscheduler.service.model.TaskNode;
import org.apache.dolphinscheduler.service.process.ProcessService;

Expand Down Expand Up @@ -1438,7 +1437,7 @@ private TaskDefinitionLog buildNormalSqlTaskDefinition(String taskName, DataSour
sqlParameters.setLocalParams(Collections.emptyList());
taskDefinition.setTaskParams(JSONUtils.toJsonString(sqlParameters));
taskDefinition.setCode(CodeGenerateUtils.genCode());
taskDefinition.setTaskType(SqlTaskChannelFactory.NAME);
taskDefinition.setTaskType("SQL");
SbloodyS marked this conversation as resolved.
Show resolved Hide resolved
taskDefinition.setFailRetryTimes(0);
taskDefinition.setFailRetryInterval(0);
taskDefinition.setTimeoutFlag(TimeoutFlag.CLOSE);
Expand Down
4 changes: 2 additions & 2 deletions dolphinscheduler-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,8 +389,8 @@
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>${mysql-connector.version}</version>
<scope>test</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions dolphinscheduler-dao-plugin/dolphinscheduler-dao-mysql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-doris/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-mysql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-starrocks/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
</dependencies>

Expand Down
Loading
Loading