diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-server/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-server/pom.xml index 808f7123c7..53aa30814b 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-server/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-server/pom.xml @@ -43,6 +43,11 @@ dolphinscheduler-dao + + org.apache.dolphinscheduler + dolphinscheduler-registry-all + + org.apache.dolphinscheduler dolphinscheduler-extract-alert @@ -115,30 +120,6 @@ - - task-pure - - false - - - - org.apache.dolphinscheduler - dolphinscheduler-registry-pure - - - - - task-all - - true - - - - org.apache.dolphinscheduler - dolphinscheduler-registry-all - - - diff --git a/dolphinscheduler-api-test/dolphinscheduler-api-test-case/pom.xml b/dolphinscheduler-api-test/dolphinscheduler-api-test-case/pom.xml index 5b16b3388d..1cdc059616 100644 --- a/dolphinscheduler-api-test/dolphinscheduler-api-test-case/pom.xml +++ b/dolphinscheduler-api-test/dolphinscheduler-api-test-case/pom.xml @@ -39,12 +39,12 @@ org.apache.dolphinscheduler dolphinscheduler-dao - dev-SNAPSHOT + 3.2.3-SNAPSHOT org.apache.dolphinscheduler dolphinscheduler-api - dev-SNAPSHOT + 3.2.3-SNAPSHOT diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml index 0bcd4499d8..95275b9933 100644 --- a/dolphinscheduler-api/pom.xml +++ b/dolphinscheduler-api/pom.xml @@ -70,6 +70,12 @@ org.apache.dolphinscheduler dolphinscheduler-ui + + + org.apache.dolphinscheduler + dolphinscheduler-registry-all + + org.apache.dolphinscheduler dolphinscheduler-scheduler-all @@ -80,11 +86,21 @@ dolphinscheduler-extract-master + + org.apache.dolphinscheduler + dolphinscheduler-storage-all + + org.apache.dolphinscheduler dolphinscheduler-extract-worker + + org.apache.dolphinscheduler + dolphinscheduler-datasource-all + + org.codehaus.janino janino @@ -290,14 +306,6 @@ org.apache.dolphinscheduler dolphinscheduler-task-pure - - org.apache.dolphinscheduler - dolphinscheduler-datasource-pure - - - org.apache.dolphinscheduler - dolphinscheduler-registry-pure - org.apache.dolphinscheduler dolphinscheduler-storage-pure @@ -314,14 +322,6 @@ org.apache.dolphinscheduler dolphinscheduler-task-all - - org.apache.dolphinscheduler - dolphinscheduler-datasource-all - - - org.apache.dolphinscheduler - dolphinscheduler-registry-all - org.apache.dolphinscheduler dolphinscheduler-storage-all diff --git a/dolphinscheduler-dist/release-docs/LICENSE b/dolphinscheduler-dist/release-docs/LICENSE index 6c68096dcd..e01d5ab085 100644 --- a/dolphinscheduler-dist/release-docs/LICENSE +++ b/dolphinscheduler-dist/release-docs/LICENSE @@ -528,7 +528,6 @@ The text of each license is also included at licenses/LICENSE-[project].txt. reactor-netty-core 1.0.22: https://mvnrepository.com/artifact/io.projectreactor.netty/reactor-netty-core/1.0.22, Apache 2.0 reactor-netty-http 1.0.22: https://mvnrepository.com/artifact/io.projectreactor.netty/reactor-netty-http/1.0.22, Apache 2.0 DmJdbcDriver18 8.1.2.79: https://mvnrepository.com/artifact/com.dameng/DmJdbcDriver18/8.1.2.79, Apache 2.0 - nimbus-jose-jwt 9.22: https://mvnrepository.com/artifact/com.nimbusds/nimbus-jose-jwt/9.22, Apache 2.0 woodstox-core 6.4.0: https://mvnrepository.com/artifact/com.fasterxml.woodstox/woodstox-core/6.4.0, Apache 2.0 auto-value 1.10.1: https://mvnrepository.com/artifact/com.google.auto.value/auto-value/1.10.1, Apache 2.0 auto-value-annotations 1.10.4: https://mvnrepository.com/artifact/com.google.auto.value/auto-value-annotations/1.10.4, Apache 2.0 diff --git a/dolphinscheduler-master/pom.xml b/dolphinscheduler-master/pom.xml index 65191b3557..ee3a843f1e 100644 --- a/dolphinscheduler-master/pom.xml +++ b/dolphinscheduler-master/pom.xml @@ -55,11 +55,21 @@ dolphinscheduler-service + + org.apache.dolphinscheduler + dolphinscheduler-registry-all + + org.apache.dolphinscheduler dolphinscheduler-scheduler-all + + org.apache.dolphinscheduler + dolphinscheduler-storage-all + + org.apache.dolphinscheduler dolphinscheduler-extract-master @@ -70,6 +80,16 @@ dolphinscheduler-extract-worker + + org.apache.dolphinscheduler + dolphinscheduler-datasource-api + + + + org.apache.dolphinscheduler + dolphinscheduler-storage-all + + org.springframework.boot spring-boot-starter-cache @@ -341,10 +361,6 @@ - - org.apache.dolphinscheduler - dolphinscheduler-registry-pure - org.apache.dolphinscheduler dolphinscheduler-storage-pure @@ -361,10 +377,6 @@ org.apache.dolphinscheduler dolphinscheduler-task-all - - org.apache.dolphinscheduler - dolphinscheduler-registry-all - org.apache.dolphinscheduler dolphinscheduler-storage-all diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/TaskExecutionContextFactory.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/TaskExecutionContextFactory.java index b3b0cf67ea..3226f6e0a0 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/TaskExecutionContextFactory.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/TaskExecutionContextFactory.java @@ -50,6 +50,7 @@ import org.apache.dolphinscheduler.plugin.task.api.model.Property; import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters; import org.apache.dolphinscheduler.plugin.task.api.parameters.K8sTaskParameters; import org.apache.dolphinscheduler.plugin.task.api.parameters.ParametersNode; +import org.apache.dolphinscheduler.plugin.task.api.parameters.SparkParameters; import org.apache.dolphinscheduler.plugin.task.api.parameters.dataquality.DataQualityParameters; import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.AbstractResourceParameters; import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.DataSourceParameters; @@ -57,7 +58,6 @@ import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.ResourceP import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.UdfFuncParameters; import org.apache.dolphinscheduler.plugin.task.api.utils.JdbcUrlParser; import org.apache.dolphinscheduler.plugin.task.api.utils.MapUtils; -import org.apache.dolphinscheduler.plugin.task.spark.SparkParameters; import org.apache.dolphinscheduler.server.master.builder.TaskExecutionContextBuilder; import org.apache.dolphinscheduler.server.master.config.MasterConfig; import org.apache.dolphinscheduler.server.master.exception.TaskExecutionContextCreateException; diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-pure/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-pure/pom.xml deleted file mode 100644 index 5f147418a6..0000000000 --- a/dolphinscheduler-registry/dolphinscheduler-registry-pure/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - 4.0.0 - - org.apache.dolphinscheduler - dolphinscheduler-registry - 3.2.3-SNAPSHOT - - - dolphinscheduler-registry-pure - - - - org.apache.dolphinscheduler - dolphinscheduler-registry-zookeeper - ${project.version} - - - diff --git a/dolphinscheduler-registry/pom.xml b/dolphinscheduler-registry/pom.xml index fd8e3d842c..e74cde5cbb 100644 --- a/dolphinscheduler-registry/pom.xml +++ b/dolphinscheduler-registry/pom.xml @@ -30,7 +30,6 @@ dolphinscheduler-registry-api dolphinscheduler-registry-plugins dolphinscheduler-registry-all - dolphinscheduler-registry-pure diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkParameters.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/SparkParameters.java similarity index 95% rename from dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkParameters.java rename to dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/SparkParameters.java index 873ba22c71..0eae7ab3b4 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkParameters.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/SparkParameters.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.dolphinscheduler.plugin.task.spark; +package org.apache.dolphinscheduler.plugin.task.api.parameters; +import org.apache.dolphinscheduler.common.enums.ProgramType; import org.apache.dolphinscheduler.plugin.task.api.model.ResourceInfo; -import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters; import java.util.ArrayList; import java.util.List; diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTask.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTask.java index 3c5fc17698..ab143df4a4 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTask.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTask.java @@ -24,6 +24,7 @@ import static org.apache.dolphinscheduler.plugin.task.spark.SparkConstants.DRIVE import static org.apache.dolphinscheduler.plugin.task.spark.SparkConstants.SPARK_KUBERNETES_NAMESPACE; import static org.apache.dolphinscheduler.plugin.task.spark.SparkConstants.SPARK_ON_K8S_MASTER_PREFIX; +import org.apache.dolphinscheduler.common.enums.ProgramType; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.plugin.task.api.AbstractYarnTask; import org.apache.dolphinscheduler.plugin.task.api.TaskException; @@ -31,6 +32,7 @@ import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext; import org.apache.dolphinscheduler.plugin.task.api.model.Property; import org.apache.dolphinscheduler.plugin.task.api.model.ResourceInfo; import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters; +import org.apache.dolphinscheduler.plugin.task.api.parameters.SparkParameters; import org.apache.dolphinscheduler.plugin.task.api.resource.ResourceContext; import org.apache.dolphinscheduler.plugin.task.api.utils.ArgsUtils; import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils; diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTaskChannel.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTaskChannel.java index 58211ea1ac..3cfb72fd0a 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTaskChannel.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTaskChannel.java @@ -23,6 +23,7 @@ import org.apache.dolphinscheduler.plugin.task.api.TaskChannel; import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext; import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters; import org.apache.dolphinscheduler.plugin.task.api.parameters.ParametersNode; +import org.apache.dolphinscheduler.plugin.task.api.parameters.SparkParameters; import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.ResourceParametersHelper; public class SparkTaskChannel implements TaskChannel { diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/test/java/org/apache/dolphinscheduler/plugin/task/spark/SparkParametersTest.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/test/java/org/apache/dolphinscheduler/plugin/task/spark/SparkParametersTest.java index 19ec707c62..457842c132 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/test/java/org/apache/dolphinscheduler/plugin/task/spark/SparkParametersTest.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/test/java/org/apache/dolphinscheduler/plugin/task/spark/SparkParametersTest.java @@ -18,6 +18,7 @@ package org.apache.dolphinscheduler.plugin.task.spark; import org.apache.dolphinscheduler.plugin.task.api.model.ResourceInfo; +import org.apache.dolphinscheduler.plugin.task.api.parameters.SparkParameters; import java.util.LinkedList; import java.util.List; diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/test/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTaskTest.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/test/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTaskTest.java index 5138562564..f3f3ef55ff 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/test/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTaskTest.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/test/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTaskTest.java @@ -20,9 +20,11 @@ package org.apache.dolphinscheduler.plugin.task.spark; import static org.apache.dolphinscheduler.plugin.task.spark.SparkConstants.TYPE_FILE; import static org.mockito.ArgumentMatchers.any; +import org.apache.dolphinscheduler.common.enums.ProgramType; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext; import org.apache.dolphinscheduler.plugin.task.api.model.ResourceInfo; +import org.apache.dolphinscheduler.plugin.task.api.parameters.SparkParameters; import org.apache.dolphinscheduler.plugin.task.api.resource.ResourceContext; import org.apache.commons.io.FileUtils; diff --git a/dolphinscheduler-worker/pom.xml b/dolphinscheduler-worker/pom.xml index bfec21b5d8..311d78861e 100644 --- a/dolphinscheduler-worker/pom.xml +++ b/dolphinscheduler-worker/pom.xml @@ -52,11 +52,21 @@ dolphinscheduler-meter + + org.apache.dolphinscheduler + dolphinscheduler-storage-all + + org.apache.dolphinscheduler dolphinscheduler-extract-alert + + org.apache.dolphinscheduler + dolphinscheduler-registry-all + + org.apache.dolphinscheduler dolphinscheduler-extract-master @@ -67,6 +77,16 @@ dolphinscheduler-extract-worker + + org.apache.dolphinscheduler + dolphinscheduler-datasource-api + + + + org.apache.dolphinscheduler + dolphinscheduler-storage-api + + org.springframework.boot spring-boot-starter @@ -167,10 +187,6 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-pure - - org.apache.dolphinscheduler - dolphinscheduler-registry-pure - org.apache.dolphinscheduler dolphinscheduler-storage-pure @@ -191,10 +207,6 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-all - - org.apache.dolphinscheduler - dolphinscheduler-registry-all - org.apache.dolphinscheduler dolphinscheduler-storage-all diff --git a/pom.xml b/pom.xml index 85d990807f..a4756e1fee 100755 --- a/pom.xml +++ b/pom.xml @@ -199,11 +199,6 @@ dolphinscheduler-registry-all ${project.version} - - org.apache.dolphinscheduler - dolphinscheduler-registry-pure - ${project.version} - org.apache.dolphinscheduler diff --git a/tools/dependencies/known-dependencies.txt b/tools/dependencies/known-dependencies.txt index d21401974e..4a591f8a08 100644 --- a/tools/dependencies/known-dependencies.txt +++ b/tools/dependencies/known-dependencies.txt @@ -431,7 +431,6 @@ azure-security-keyvault-keys-4.5.4.jar azure-security-keyvault-secrets-4.5.4.jar azure-storage-common-12.20.0.jar azure-storage-file-share-12.17.0.jar -nimbus-jose-jwt-9.22.jar woodstox-core-6.4.0.jar azure-core-management-1.10.1.jar api-common-2.6.0.jar