You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ke...@apache.org on 2022/09/07 02:56:58 UTC
[dolphinscheduler] branch cve updated (130943af73 -> e60bdd3f9b)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch cve
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
omit 130943af73 Merge branch 'dev' into cve
omit 6d460a3ca2 [DSIP-13][python] New mechanism file plugins to Python API (#11360)
omit f0db90f71d [Doc] Remove re-upload file function in the 3.0.0's doc (#11804)
omit 7c0c1f4b78 Update dolphinscheduler_ddl.sql fix alert t_ds_user add time_zone is not correct (#11795)
omit 2eb8b9f7f0 [Feature][Registry] Support etcd as registry (#10981)
omit 6f3b0b2432 [k8s] Delete unnecessary configurations. (#11808)
omit 0e534dd61f [python] Fix permission error when create related objects (#11783)
omit 45ebd528d6 [Bug-11650][worker] #11650 fix SQL type task, stop task cause NPE (#11668)
omit 6464355e23 Merge branch 'dev' into cve
omit 38ee91fb1e [DSIP-11][python] create workflows from YAML configuration (#11611)
omit 8988492c43 [Feat][python] Add parameter environment to task (#11763)
omit 4283cfd7a1 [fix][API]fix task types sequence (#11775)
add e60bdd3f9b Merge branch 'dev' into cve
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (130943af73)
\
N -- N -- N refs/heads/cve (e60bdd3f9b)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.../dolphinscheduler/templates/_helpers.tpl | 13 +
.../configmap-dolphinscheduler-common.yaml | 2 +-
.../templates/deployment-dolphinscheduler-api.yaml | 1 +
.../job-dolphinscheduler-schema-initializer.yaml | 1 +
...l-database.yaml => secret-external-fs-s3a.yaml} | 8 +-
.../statefulset-dolphinscheduler-master.yaml | 1 +
.../statefulset-dolphinscheduler-worker.yaml | 1 +
deploy/kubernetes/dolphinscheduler/values.yaml | 19 +-
docs/docs/en/guide/resource/file-manage.md | 6 +
docs/docs/zh/guide/resource/file-manage.md | 8 +
docs/img/reupload_file_en.png | Bin 0 -> 168894 bytes
.../api/configuration/TaskTypeConfiguration.java | 41 +-
.../dolphinscheduler/api/dto/FavTaskDto.java | 7 +-
.../dolphinscheduler/api/python/PythonGateway.java | 28 +-
.../api/service/impl/FavTaskServiceImpl.java | 6 +-
dolphinscheduler-bom/pom.xml | 31 +-
.../dolphinscheduler/dao/mapper/FavTaskMapper.xml | 4 +-
.../3.0.0_schema/mysql/dolphinscheduler_ddl.sql | 4 +-
dolphinscheduler-dist/release-docs/LICENSE | 19 +-
dolphinscheduler-dist/release-docs/NOTICE | 128 ------
.../licenses/LICENSE-auto-service-annotations.txt | 13 -
.../release-docs/licenses/LICENSE-failsafe.txt | 177 --------
.../release-docs/licenses/LICENSE-grpc.txt | 202 ---------
.../release-docs/licenses/LICENSE-jetcd.txt | 202 ---------
.../LICENSE-proto-google-common-protos.txt | 201 ---------
.../licenses/LICENSE-protobuf-java-util.txt | 42 --
.../licenses/LISCENSE-perfmark-api.txt | 201 ---------
.../pydolphinscheduler/docs/source/index.rst | 1 -
.../docs/source/resources_plugin/develop.rst | 46 --
.../docs/source/resources_plugin/index.rst | 28 --
.../docs/source/resources_plugin/local.rst | 32 --
.../source/resources_plugin/resource-plugin.rst | 75 ----
.../docs/source/tasks/condition.rst | 7 -
.../pydolphinscheduler/docs/source/tasks/datax.rst | 13 -
.../docs/source/tasks/dependent.rst | 14 -
.../pydolphinscheduler/docs/source/tasks/flink.rst | 7 -
.../docs/source/tasks/func_wrap.rst | 2 +-
.../pydolphinscheduler/docs/source/tasks/http.rst | 8 -
.../docs/source/tasks/map_reduce.rst | 8 -
.../docs/source/tasks/procedure.rst | 8 -
.../docs/source/tasks/python.rst | 8 -
.../pydolphinscheduler/docs/source/tasks/shell.rst | 8 -
.../pydolphinscheduler/docs/source/tasks/spark.rst | 8 -
.../pydolphinscheduler/docs/source/tasks/sql.rst | 14 -
.../docs/source/tasks/sub_process.rst | 17 -
.../docs/source/tasks/switch.rst | 9 -
.../pydolphinscheduler/docs/source/tutorial.rst | 96 -----
.../examples/yaml_define/Condition.yaml | 43 --
.../examples/yaml_define/DataX.yaml | 33 --
.../examples/yaml_define/Dependent.yaml | 76 ----
.../examples/yaml_define/Dependent_External.yaml | 26 --
.../examples/yaml_define/Flink.yaml | 29 --
.../examples/yaml_define/Http.yaml | 37 --
.../examples/yaml_define/MapReduce.yaml | 29 --
.../examples/yaml_define/MoreConfiguration.yaml | 40 --
.../examples/yaml_define/Procedure.yaml | 27 --
.../examples/yaml_define/Python.yaml | 30 --
.../examples/yaml_define/Shell.yaml | 40 --
.../examples/yaml_define/Spark.yaml | 30 --
.../examples/yaml_define/Sql.yaml | 45 --
.../examples/yaml_define/SubProcess.yaml | 27 --
.../examples/yaml_define/Switch.yaml | 39 --
.../examples/yaml_define/example_datax.json | 62 ---
.../examples/yaml_define/example_sql.sql | 22 -
.../examples/yaml_define/example_sub_workflow.yaml | 26 --
.../examples/yaml_define/tutorial.yaml | 46 --
.../src/pydolphinscheduler/cli/commands.py | 14 -
.../pydolphinscheduler/core/process_definition.py | 3 -
.../src/pydolphinscheduler/core/resource_plugin.py | 49 ---
.../src/pydolphinscheduler/core/task.py | 58 +--
.../pydolphinscheduler/core/yaml_process_define.py | 466 ---------------------
.../examples/tutorial_resource_plugin.py | 64 ---
.../src/pydolphinscheduler/exceptions.py | 4 -
.../src/pydolphinscheduler/java_gateway.py | 4 -
.../resources_plugin/__init__.py | 23 -
.../pydolphinscheduler/resources_plugin/local.py | 57 ---
.../src/pydolphinscheduler/tasks/__init__.py | 1 -
.../src/pydolphinscheduler/tasks/shell.py | 5 +-
.../pydolphinscheduler/tests/core/test_engine.py | 1 -
.../pydolphinscheduler/tests/core/test_task.py | 117 +-----
.../tests/core/test_yaml_process_define.py | 191 ---------
.../tests/example/test_example.py | 6 +-
.../tests/resources_plugin/__init__.py | 18 -
.../tests/resources_plugin/test_local.py | 108 -----
.../tests/tasks/test_condition.py | 1 -
.../pydolphinscheduler/tests/tasks/test_datax.py | 2 -
.../tests/tasks/test_dependent.py | 1 -
.../pydolphinscheduler/tests/tasks/test_flink.py | 1 -
.../pydolphinscheduler/tests/tasks/test_http.py | 1 -
.../tests/tasks/test_map_reduce.py | 1 -
.../tests/tasks/test_procedure.py | 1 -
.../pydolphinscheduler/tests/tasks/test_python.py | 1 -
.../tests/tasks/test_sagemaker.py | 1 -
.../pydolphinscheduler/tests/tasks/test_shell.py | 46 +-
.../pydolphinscheduler/tests/tasks/test_spark.py | 1 -
.../pydolphinscheduler/tests/tasks/test_sql.py | 1 -
.../tests/tasks/test_sub_process.py | 1 -
.../pydolphinscheduler/tests/tasks/test_switch.py | 1 -
.../pydolphinscheduler/tests/testing/path.py | 1 -
dolphinscheduler-registry/README.md | 33 --
.../dolphinscheduler-registry-all/pom.xml | 5 -
.../registry/api/ConnectionListener.java | 4 -
.../registry/api/ConnectionState.java | 3 -
.../dolphinscheduler/registry/api/Event.java | 4 -
.../dolphinscheduler/registry/api/Registry.java | 42 +-
.../dolphinscheduler-registry-etcd/README.md | 27 --
.../dolphinscheduler-registry-etcd/pom.xml | 67 ---
.../registry/etcd/EtcdConnectionStateListener.java | 115 -----
.../plugin/registry/etcd/EtcdRegistry.java | 344 ---------------
.../registry/etcd/EtcdRegistryProperties.java | 49 ---
.../plugin/registry/etcd/EtcdRegistryTest.java | 142 -------
.../plugin/registry/mysql/MysqlRegistry.java | 1 -
.../dolphinscheduler-registry-zookeeper/README.md | 27 --
.../registry/zookeeper/ZookeeperRegistryTest.java | 5 +-
.../dolphinscheduler-registry-plugins/pom.xml | 1 -
.../server/worker/processor/TaskKillProcessor.java | 39 +-
tools/dependencies/known-dependencies.txt | 19 +-
117 files changed, 105 insertions(+), 4554 deletions(-)
copy deploy/kubernetes/dolphinscheduler/templates/{secret-external-database.yaml => secret-external-fs-s3a.yaml} (79%)
create mode 100644 docs/img/reupload_file_en.png
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-auto-service-annotations.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-failsafe.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-grpc.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-jetcd.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-proto-google-common-protos.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-protobuf-java-util.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LISCENSE-perfmark-api.txt
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/docs/source/resources_plugin/develop.rst
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/docs/source/resources_plugin/index.rst
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/docs/source/resources_plugin/local.rst
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/docs/source/resources_plugin/resource-plugin.rst
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/examples/yaml_define/Condition.yaml
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/examples/yaml_define/DataX.yaml
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/examples/yaml_define/Dependent.yaml
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/examples/yaml_define/Dependent_External.yaml
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/examples/yaml_define/Flink.yaml
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/examples/yaml_define/Http.yaml
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/examples/yaml_define/MapReduce.yaml
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/examples/yaml_define/MoreConfiguration.yaml
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/examples/yaml_define/Procedure.yaml
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/examples/yaml_define/Python.yaml
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/examples/yaml_define/Shell.yaml
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/examples/yaml_define/Spark.yaml
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/examples/yaml_define/Sql.yaml
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/examples/yaml_define/SubProcess.yaml
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/examples/yaml_define/Switch.yaml
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/examples/yaml_define/example_datax.json
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/examples/yaml_define/example_sql.sql
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/examples/yaml_define/example_sub_workflow.yaml
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/examples/yaml_define/tutorial.yaml
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/src/pydolphinscheduler/core/resource_plugin.py
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/src/pydolphinscheduler/core/yaml_process_define.py
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/src/pydolphinscheduler/examples/tutorial_resource_plugin.py
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/src/pydolphinscheduler/resources_plugin/__init__.py
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/src/pydolphinscheduler/resources_plugin/local.py
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/tests/core/test_yaml_process_define.py
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/tests/resources_plugin/__init__.py
delete mode 100644 dolphinscheduler-python/pydolphinscheduler/tests/resources_plugin/test_local.py
delete mode 100644 dolphinscheduler-registry/README.md
delete mode 100644 dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/README.md
delete mode 100644 dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/pom.xml
delete mode 100644 dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/src/main/java/org/apache/dolphinscheduler/plugin/registry/etcd/EtcdConnectionStateListener.java
delete mode 100644 dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/src/main/java/org/apache/dolphinscheduler/plugin/registry/etcd/EtcdRegistry.java
delete mode 100644 dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/src/main/java/org/apache/dolphinscheduler/plugin/registry/etcd/EtcdRegistryProperties.java
delete mode 100644 dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/src/test/java/org/apache/dolphinscheduler/plugin/registry/etcd/EtcdRegistryTest.java
delete mode 100644 dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/README.md