Skip to content

Commit 6d7dbe6

Browse files
authored
Reduce the size of tarball to continue ASF release (#15004)
* Reduce the size of tarball to continue ASF release for more detail you can see https://lists.apache.org/thread/rmp7fghlj0n7h9y2v3p8gkw9f9qbo6qt * rename the new module * spotless * license * fix api test * fix api test
1 parent a8272b2 commit 6d7dbe6

File tree

17 files changed

+612
-22
lines changed

17 files changed

+612
-22
lines changed

Diff for: dolphinscheduler-alert/dolphinscheduler-alert-server/pom.xml

+10
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,16 @@
4444
<dependency>
4545
<groupId>org.apache.dolphinscheduler</groupId>
4646
<artifactId>dolphinscheduler-dao</artifactId>
47+
<exclusions>
48+
<exclusion>
49+
<groupId>org.apache.dolphinscheduler</groupId>
50+
<artifactId>dolphinscheduler-task-api</artifactId>
51+
</exclusion>
52+
<exclusion>
53+
<groupId>org.apache.dolphinscheduler</groupId>
54+
<artifactId>dolphinscheduler-storage-api</artifactId>
55+
</exclusion>
56+
</exclusions>
4757
</dependency>
4858

4959
<dependency>

Diff for: dolphinscheduler-api-test/dolphinscheduler-api-test-case/pom.xml

+10
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,15 @@
4646
<artifactId>dolphinscheduler-api</artifactId>
4747
<version>dev-SNAPSHOT</version>
4848
</dependency>
49+
<dependency>
50+
<groupId>org.apache.httpcomponents</groupId>
51+
<artifactId>httpclient</artifactId>
52+
<version>4.5.13</version>
53+
</dependency>
54+
<dependency>
55+
<groupId>org.apache.httpcomponents</groupId>
56+
<artifactId>httpmime</artifactId>
57+
<version>4.5.13</version>
58+
</dependency>
4959
</dependencies>
5060
</project>

Diff for: dolphinscheduler-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262

6363
<dependency>
6464
<groupId>org.apache.dolphinscheduler</groupId>
65-
<artifactId>dolphinscheduler-task-all</artifactId>
65+
<artifactId>dolphinscheduler-task-all-prune</artifactId>
6666
</dependency>
6767

6868
<dependency>

Diff for: dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SchedulerServiceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ public void setScheduleState(User loginUser,
496496
if (!subProcessDefineCodes.isEmpty()) {
497497
log.info(
498498
"Need to check sub process definition state before change schedule state, subProcessDefineCodes:{}.",
499-
org.apache.commons.lang.StringUtils.join(subProcessDefineCodes, ","));
499+
StringUtils.join(subProcessDefineCodes, ","));
500500
List<ProcessDefinition> subProcessDefinitionList =
501501
processDefinitionMapper.queryByCodes(subProcessDefineCodes);
502502
if (subProcessDefinitionList != null && !subProcessDefinitionList.isEmpty()) {

Diff for: dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
import org.springframework.transaction.annotation.Transactional;
6767

6868
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
69-
import com.facebook.presto.jdbc.internal.guava.base.Strings;
7069

7170
/**
7271
* worker group service impl
@@ -249,7 +248,7 @@ private boolean checkWorkerGroupDependencies(WorkerGroup workerGroup, Map<String
249248
* @return boolean
250249
*/
251250
private String checkWorkerGroupAddrList(WorkerGroup workerGroup) {
252-
if (Strings.isNullOrEmpty(workerGroup.getAddrList())) {
251+
if (StringUtils.isEmpty(workerGroup.getAddrList())) {
253252
return null;
254253
}
255254
Map<String, String> serverMaps = registryClient.getServerMaps(RegistryNodeType.WORKER);

Diff for: dolphinscheduler-dist/src/main/assembly/dolphinscheduler-bin.xml

+17-5
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,28 @@
6767
<fileSet>
6868
<directory>${basedir}/../dolphinscheduler-tools/target/tools</directory>
6969
<outputDirectory>tools</outputDirectory>
70+
<excludes>
71+
<exclude>libs/</exclude>
72+
<exclude>bin/</exclude>
73+
<exclude>dist-bin/</exclude>
74+
</excludes>
7075
</fileSet>
71-
7276
<fileSet>
73-
<directory>${basedir}/../dolphinscheduler-dist/target/dolphinscheduler-dist-${project.version}</directory>
74-
<outputDirectory>.</outputDirectory>
77+
<directory>${basedir}/../dolphinscheduler-tools/target/tools/libs</directory>
78+
<outputDirectory>tools/libs</outputDirectory>
79+
<includes>
80+
<include>dolphinscheduler-*.jar</include>
81+
<include>spring-*.jar</include>
82+
</includes>
83+
</fileSet>
84+
<fileSet>
85+
<directory>${basedir}/../dolphinscheduler-tools/target/tools/dist-bin</directory>
86+
<outputDirectory>tools/bin</outputDirectory>
7587
</fileSet>
7688

7789
<fileSet>
78-
<directory>${basedir}/../dolphinscheduler-ui/dist</directory>
79-
<outputDirectory>./ui</outputDirectory>
90+
<directory>${basedir}/../dolphinscheduler-dist/target/dolphinscheduler-dist-${project.version}</directory>
91+
<outputDirectory>.</outputDirectory>
8092
</fileSet>
8193

8294
<fileSet>

Diff for: dolphinscheduler-master/pom.xml

+1-6
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,7 @@
6565

6666
<dependency>
6767
<groupId>org.apache.dolphinscheduler</groupId>
68-
<artifactId>dolphinscheduler-task-all</artifactId>
69-
</dependency>
70-
71-
<dependency>
72-
<groupId>org.apache.dolphinscheduler</groupId>
73-
<artifactId>dolphinscheduler-storage-all</artifactId>
68+
<artifactId>dolphinscheduler-task-all-prune</artifactId>
7469
</dependency>
7570

7671
<dependency>

Diff for: dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/metrics/TaskMetrics.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
import lombok.experimental.UtilityClass;
2626

27-
import com.facebook.presto.jdbc.internal.guava.collect.ImmutableSet;
27+
import com.google.common.collect.ImmutableSet;
2828

2929
import io.micrometer.core.instrument.Counter;
3030
import io.micrometer.core.instrument.Gauge;

Diff for: dolphinscheduler-storage-plugin/dolphinscheduler-storage-oss/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,10 @@
3838
<artifactId>dolphinscheduler-task-api</artifactId>
3939
<version>${project.version}</version>
4040
</dependency>
41+
42+
<dependency>
43+
<groupId>com.aliyun.oss</groupId>
44+
<artifactId>aliyun-sdk-oss</artifactId>
45+
</dependency>
4146
</dependencies>
4247
</project>

0 commit comments

Comments
 (0)