From 3bc88e32c76e1ca3526c67b0c3bf77d420967f64 Mon Sep 17 00:00:00 2001 From: Wenjun Ruan Date: Fri, 31 May 2024 17:12:22 +0800 Subject: [PATCH] Rename dolphinscheduler-aop to dolphinscheduler-yarn-aop (#16095) --- dolphinscheduler-dist/release-docs/LICENSE | 1 - dolphinscheduler-tools/pom.xml | 67 ------------------- dolphinscheduler-worker/pom.xml | 67 +++++++++++++++++++ .../pom.xml | 2 +- .../aop/YarnClientAspect.java | 0 .../src/main/resources/META-INF/aop.xml | 0 .../src/main/resources/log4j.properties | 0 .../YarnClientAspectMocTest.java | 0 .../poc/YarnClientAspectMoc.java | 0 .../dolphinscheduler/poc/YarnClientMoc.java | 0 .../src/test/resources/log4j.properties | 0 pom.xml | 4 +- tools/dependencies/known-dependencies.txt | 1 - 13 files changed, 70 insertions(+), 72 deletions(-) rename {dolphinscheduler-aop => dolphinscheduler-yarn-aop}/pom.xml (98%) rename {dolphinscheduler-aop => dolphinscheduler-yarn-aop}/src/main/java/org/apache/dolphinscheduler/aop/YarnClientAspect.java (100%) rename {dolphinscheduler-aop => dolphinscheduler-yarn-aop}/src/main/resources/META-INF/aop.xml (100%) rename {dolphinscheduler-aop => dolphinscheduler-yarn-aop}/src/main/resources/log4j.properties (100%) rename {dolphinscheduler-aop => dolphinscheduler-yarn-aop}/src/test/java/org/apache/dolphinscheduler/YarnClientAspectMocTest.java (100%) rename {dolphinscheduler-aop => dolphinscheduler-yarn-aop}/src/test/java/org/apache/dolphinscheduler/poc/YarnClientAspectMoc.java (100%) rename {dolphinscheduler-aop => dolphinscheduler-yarn-aop}/src/test/java/org/apache/dolphinscheduler/poc/YarnClientMoc.java (100%) rename {dolphinscheduler-aop => dolphinscheduler-yarn-aop}/src/test/resources/log4j.properties (100%) diff --git a/dolphinscheduler-dist/release-docs/LICENSE b/dolphinscheduler-dist/release-docs/LICENSE index 84832b2b32..41400d26f5 100644 --- a/dolphinscheduler-dist/release-docs/LICENSE +++ b/dolphinscheduler-dist/release-docs/LICENSE @@ -525,7 +525,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-tools/pom.xml b/dolphinscheduler-tools/pom.xml index dbba85d10d..99d1a51e9c 100644 --- a/dolphinscheduler-tools/pom.xml +++ b/dolphinscheduler-tools/pom.xml @@ -53,73 +53,6 @@ dolphinscheduler-storage-all - - org.apache.dolphinscheduler - dolphinscheduler-aop - - - aopalliance - aopalliance - - - com.google.inject - guice - - - com.google.inject.extensions - guice-servlet - - - javax.inject - javax.inject - - - com.sun.xml.bind - jaxb-impl - - - com.sun.jersey.contribs - jersey-guice - - - com.sun.jersey - jersey-client - - - javax.ws.rs - jsr311-api - - - com.sun.jersey - jersey-core - - - com.sun.jersey - jersey-json - - - com.sun.jersey - jersey-server - - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-mapper-asl - - - org.codehaus.jackson - jackson-jaxrs - - - org.codehaus.jackson - jackson-xc - - - - org.springframework.boot spring-boot-starter-test diff --git a/dolphinscheduler-worker/pom.xml b/dolphinscheduler-worker/pom.xml index 700ecb90d6..a6f39ca15e 100644 --- a/dolphinscheduler-worker/pom.xml +++ b/dolphinscheduler-worker/pom.xml @@ -81,6 +81,73 @@ dolphinscheduler-extract-worker + + org.apache.dolphinscheduler + dolphinscheduler-yarn-aop + + + aopalliance + aopalliance + + + com.google.inject + guice + + + com.google.inject.extensions + guice-servlet + + + javax.inject + javax.inject + + + com.sun.xml.bind + jaxb-impl + + + com.sun.jersey.contribs + jersey-guice + + + com.sun.jersey + jersey-client + + + javax.ws.rs + jsr311-api + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-json + + + com.sun.jersey + jersey-server + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + + org.springframework.boot spring-boot-starter diff --git a/dolphinscheduler-aop/pom.xml b/dolphinscheduler-yarn-aop/pom.xml similarity index 98% rename from dolphinscheduler-aop/pom.xml rename to dolphinscheduler-yarn-aop/pom.xml index 25858423ff..5ec4c342e3 100644 --- a/dolphinscheduler-aop/pom.xml +++ b/dolphinscheduler-yarn-aop/pom.xml @@ -23,7 +23,7 @@ dolphinscheduler dev-SNAPSHOT - dolphinscheduler-aop + dolphinscheduler-yarn-aop jar ${project.artifactId} aop 4 YarnClient to get application id when submitting jars using 'yarn jar mainClass args' diff --git a/dolphinscheduler-aop/src/main/java/org/apache/dolphinscheduler/aop/YarnClientAspect.java b/dolphinscheduler-yarn-aop/src/main/java/org/apache/dolphinscheduler/aop/YarnClientAspect.java similarity index 100% rename from dolphinscheduler-aop/src/main/java/org/apache/dolphinscheduler/aop/YarnClientAspect.java rename to dolphinscheduler-yarn-aop/src/main/java/org/apache/dolphinscheduler/aop/YarnClientAspect.java diff --git a/dolphinscheduler-aop/src/main/resources/META-INF/aop.xml b/dolphinscheduler-yarn-aop/src/main/resources/META-INF/aop.xml similarity index 100% rename from dolphinscheduler-aop/src/main/resources/META-INF/aop.xml rename to dolphinscheduler-yarn-aop/src/main/resources/META-INF/aop.xml diff --git a/dolphinscheduler-aop/src/main/resources/log4j.properties b/dolphinscheduler-yarn-aop/src/main/resources/log4j.properties similarity index 100% rename from dolphinscheduler-aop/src/main/resources/log4j.properties rename to dolphinscheduler-yarn-aop/src/main/resources/log4j.properties diff --git a/dolphinscheduler-aop/src/test/java/org/apache/dolphinscheduler/YarnClientAspectMocTest.java b/dolphinscheduler-yarn-aop/src/test/java/org/apache/dolphinscheduler/YarnClientAspectMocTest.java similarity index 100% rename from dolphinscheduler-aop/src/test/java/org/apache/dolphinscheduler/YarnClientAspectMocTest.java rename to dolphinscheduler-yarn-aop/src/test/java/org/apache/dolphinscheduler/YarnClientAspectMocTest.java diff --git a/dolphinscheduler-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientAspectMoc.java b/dolphinscheduler-yarn-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientAspectMoc.java similarity index 100% rename from dolphinscheduler-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientAspectMoc.java rename to dolphinscheduler-yarn-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientAspectMoc.java diff --git a/dolphinscheduler-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientMoc.java b/dolphinscheduler-yarn-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientMoc.java similarity index 100% rename from dolphinscheduler-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientMoc.java rename to dolphinscheduler-yarn-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientMoc.java diff --git a/dolphinscheduler-aop/src/test/resources/log4j.properties b/dolphinscheduler-yarn-aop/src/test/resources/log4j.properties similarity index 100% rename from dolphinscheduler-aop/src/test/resources/log4j.properties rename to dolphinscheduler-yarn-aop/src/test/resources/log4j.properties diff --git a/pom.xml b/pom.xml index 43c476d317..aeadd3adc0 100755 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ dolphinscheduler-task-plugin dolphinscheduler-common dolphinscheduler-api - dolphinscheduler-aop + dolphinscheduler-yarn-aop dolphinscheduler-dao dolphinscheduler-dist dolphinscheduler-service @@ -137,7 +137,7 @@ org.apache.dolphinscheduler - dolphinscheduler-aop + dolphinscheduler-yarn-aop ${project.version} diff --git a/tools/dependencies/known-dependencies.txt b/tools/dependencies/known-dependencies.txt index 33987119db..8e76b77767 100644 --- a/tools/dependencies/known-dependencies.txt +++ b/tools/dependencies/known-dependencies.txt @@ -429,7 +429,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