This is an automated email from the ASF dual-hosted git repository.
wenjun pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 3bc88e32c7 Rename dolphinscheduler-aop to dolphinscheduler-yarn-aop
(#16095)
3bc88e32c7 is described below
commit 3bc88e32c76e1ca3526c67b0c3bf77d420967f64
Author: Wenjun Ruan <[email protected]>
AuthorDate: Fri May 31 17:12:22 2024 +0800
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 +-
.../dolphinscheduler/aop/YarnClientAspect.java | 0
.../src/main/resources/META-INF/aop.xml | 0
.../src/main/resources/log4j.properties | 0
.../dolphinscheduler/YarnClientAspectMocTest.java | 0
.../dolphinscheduler/poc/YarnClientAspectMoc.java | 0
.../apache/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(-)
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 @@
<artifactId>dolphinscheduler-storage-all</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.dolphinscheduler</groupId>
- <artifactId>dolphinscheduler-aop</artifactId>
- <exclusions>
- <exclusion>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-servlet</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-guice</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-xc</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
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 @@
<artifactId>dolphinscheduler-extract-worker</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler-yarn-aop</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-servlet</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-guice</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-jaxrs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-xc</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
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 @@
<artifactId>dolphinscheduler</artifactId>
<version>dev-SNAPSHOT</version>
</parent>
- <artifactId>dolphinscheduler-aop</artifactId>
+ <artifactId>dolphinscheduler-yarn-aop</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>aop 4 YarnClient to get application id when submitting jars
using 'yarn jar mainClass args'</description>
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 @@
<module>dolphinscheduler-task-plugin</module>
<module>dolphinscheduler-common</module>
<module>dolphinscheduler-api</module>
- <module>dolphinscheduler-aop</module>
+ <module>dolphinscheduler-yarn-aop</module>
<module>dolphinscheduler-dao</module>
<module>dolphinscheduler-dist</module>
<module>dolphinscheduler-service</module>
@@ -137,7 +137,7 @@
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
- <artifactId>dolphinscheduler-aop</artifactId>
+ <artifactId>dolphinscheduler-yarn-aop</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
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
