Skip to content

Commit

Permalink
Rename dolphinscheduler-aop to dolphinscheduler-yarn-aop (#16095)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ruanwenjun
ruanwenjun authored May 31, 2024
1 parent d675c28 commit 3bc88e3
Show file tree
Hide file tree
Showing 13 changed files with 70 additions and 72 deletions.
1 change: 0 additions & 1 deletion dolphinscheduler-dist/release-docs/LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
67 changes: 0 additions & 67 deletions dolphinscheduler-tools/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
67 changes: 67 additions & 0 deletions dolphinscheduler-worker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion dolphinscheduler-aop/pom.xml → dolphinscheduler-yarn-aop/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
0 ...olphinscheduler/aop/YarnClientAspect.java → ...olphinscheduler/aop/YarnClientAspect.java
View file
File renamed without changes.
0 ...r-aop/src/main/resources/META-INF/aop.xml → ...n-aop/src/main/resources/META-INF/aop.xml
View file
File renamed without changes.
0 ...r-aop/src/main/resources/log4j.properties → ...n-aop/src/main/resources/log4j.properties
View file
File renamed without changes.
0 ...hinscheduler/YarnClientAspectMocTest.java → ...hinscheduler/YarnClientAspectMocTest.java
View file
File renamed without changes.
0 ...hinscheduler/poc/YarnClientAspectMoc.java → ...hinscheduler/poc/YarnClientAspectMoc.java
View file
File renamed without changes.
0 ...e/dolphinscheduler/poc/YarnClientMoc.java → ...e/dolphinscheduler/poc/YarnClientMoc.java
View file
File renamed without changes.
0 ...r-aop/src/test/resources/log4j.properties → ...n-aop/src/test/resources/log4j.properties
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion tools/dependencies/known-dependencies.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3bc88e3

Please sign in to comment.