Skip to content

Commit d954f72

Browse files
SbloodySSbloodyS
authored
Merge 9836227 into 0e2d0fb 
2 parents 0e2d0fb + 9836227 commit d954f72

File tree

48 files changed

+38
-1211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+38
-1211
lines changed

‎docs/configs/docsdev.js‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,6 @@ export default {
145145
title: 'Sqoop',
146146
link: '/en-us/docs/dev/user_doc/guide/task/sqoop.html',
147147
},
148-
{
149-
title: 'Pigeon',
150-
link: '/en-us/docs/dev/user_doc/guide/task/pigeon.html',
151-
},
152148
{
153149
title: 'Conditions',
154150
link: '/en-us/docs/dev/user_doc/guide/task/conditions.html',
@@ -877,10 +873,6 @@ export default {
877873
title: 'Sqoop',
878874
link: '/zh-cn/docs/dev/user_doc/guide/task/sqoop.html',
879875
},
880-
{
881-
title: 'Pigeon',
882-
link: '/zh-cn/docs/dev/user_doc/guide/task/pigeon.html',
883-
},
884876
{
885877
title: 'Conditions',
886878
link: '/zh-cn/docs/dev/user_doc/guide/task/conditions.html',

‎docs/docs/en/guide/task/pigeon.md‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎docs/docs/en/guide/upgrade/incompatible.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,5 @@ This document records the incompatible updates between each version. You need to
2929
## 3.3.0
3030

3131
* Remove the `udf-manage` function from the `resource center` ([#16209])
32+
* Remove the `Pigeon` from the `Task Plugin` ([#16218])
3233

‎docs/docs/zh/guide/task/pigeon.md‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎docs/docs/zh/guide/upgrade/incompatible.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,5 @@
2727
## 3.3.0
2828

2929
* 从 `资源中心` 中移除了 `udf-manage` 功能 ([#16209])
30+
* 从 `任务插件` 中移除了 `Pigeon` 类型 ([#16218])
3031

‎docs/img/pigeon.png‎

-1.16 KB
Binary file not shown.

‎dolphinscheduler-api/src/main/resources/dynamic-task-type-config.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,3 @@ dynamic-task:
2828
- {name: DATA_QUALITY,icon: shell-icon.png,hover: shell-hover.png}
2929
machineLearning:
3030
- {name: JUPYTER,icon: shell-icon.png,hover: shell-hover.png}
31-
other:
32-
- {name: PIGEON,icon: shell-icon.png,hover: shell-hover.png}

‎dolphinscheduler-api/src/main/resources/task-type-config.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ task:
5656
- 'PYTORCH'
5757
- 'KUBEFLOW'
5858
other:
59-
- 'PIGEON'
6059
- 'ZEPPELIN'
6160
- 'CHUNJUN'
6261
- 'DATASYNC'

‎dolphinscheduler-bom/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
<netty.version>4.1.53.Final</netty.version>
3232
<spring-boot.version>2.7.3</spring-boot.version>
3333
<spring-ldap.version>2.4.1</spring-ldap.version>
34-
<java-websocket.version>1.5.1</java-websocket.version>
3534
<mybatis-plus.version>3.5.2</mybatis-plus.version>
3635
<quartz.version>2.3.2</quartz.version>
3736
<druid.version>1.2.20</druid.version>
@@ -169,11 +168,6 @@
169168
<scope>test</scope>
170169
</dependency>
171170

172-
<dependency>
173-
<groupId>org.java-websocket</groupId>
174-
<artifactId>Java-WebSocket</artifactId>
175-
<version>${java-websocket.version}</version>
176-
</dependency>
177171
<!-- mybatis -->
178172
<dependency>
179173
<groupId>com.baomidou</groupId>

‎dolphinscheduler-common/src/main/resources/common.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ data.basedir.path=/tmp/dolphinscheduler
2626
# use shared file mount point
2727
resource.storage.type=LOCAL
2828
# resource store on HDFS/S3 path, resource file will store to this base path, self configuration, please make sure the directory exists on hdfs and have read write permissions. "/dolphinscheduler" is recommended
29-
resource.storage.upload.base.path=/dolphinscheduler
29+
resource.storage.upload.base.path=/tmp/dolphinscheduler
3030

3131
# The Azure client ID (Azure Application (client) ID)
3232
resource.azure.client.id=minioadmin

0 commit comments

Comments
 (0)