Skip to content

Commit 3bc88e3

Browse files
ruanwenjunruanwenjun
authored
Rename dolphinscheduler-aop to dolphinscheduler-yarn-aop (apache#16095)
1 parent d675c28 commit 3bc88e3

File tree

13 files changed

+70
-72
lines changed

13 files changed

+70
-72
lines changed

‎dolphinscheduler-dist/release-docs/LICENSE

-1
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,6 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
525525
reactor-netty-core 1.0.22: https://mvnrepository.com/artifact/io.projectreactor.netty/reactor-netty-core/1.0.22, Apache 2.0
526526
reactor-netty-http 1.0.22: https://mvnrepository.com/artifact/io.projectreactor.netty/reactor-netty-http/1.0.22, Apache 2.0
527527
DmJdbcDriver18 8.1.2.79: https://mvnrepository.com/artifact/com.dameng/DmJdbcDriver18/8.1.2.79, Apache 2.0
528-
nimbus-jose-jwt 9.22: https://mvnrepository.com/artifact/com.nimbusds/nimbus-jose-jwt/9.22, Apache 2.0
529528
woodstox-core 6.4.0: https://mvnrepository.com/artifact/com.fasterxml.woodstox/woodstox-core/6.4.0, Apache 2.0
530529
auto-value 1.10.1: https://mvnrepository.com/artifact/com.google.auto.value/auto-value/1.10.1, Apache 2.0
531530
auto-value-annotations 1.10.4: https://mvnrepository.com/artifact/com.google.auto.value/auto-value-annotations/1.10.4, Apache 2.0

‎dolphinscheduler-tools/pom.xml

-67
Original file line numberDiff line numberDiff line change
@@ -53,73 +53,6 @@
5353
<artifactId>dolphinscheduler-storage-all</artifactId>
5454
</dependency>
5555

56-
<dependency>
57-
<groupId>org.apache.dolphinscheduler</groupId>
58-
<artifactId>dolphinscheduler-aop</artifactId>
59-
<exclusions>
60-
<exclusion>
61-
<groupId>aopalliance</groupId>
62-
<artifactId>aopalliance</artifactId>
63-
</exclusion>
64-
<exclusion>
65-
<groupId>com.google.inject</groupId>
66-
<artifactId>guice</artifactId>
67-
</exclusion>
68-
<exclusion>
69-
<groupId>com.google.inject.extensions</groupId>
70-
<artifactId>guice-servlet</artifactId>
71-
</exclusion>
72-
<exclusion>
73-
<groupId>javax.inject</groupId>
74-
<artifactId>javax.inject</artifactId>
75-
</exclusion>
76-
<exclusion>
77-
<groupId>com.sun.xml.bind</groupId>
78-
<artifactId>jaxb-impl</artifactId>
79-
</exclusion>
80-
<exclusion>
81-
<groupId>com.sun.jersey.contribs</groupId>
82-
<artifactId>jersey-guice</artifactId>
83-
</exclusion>
84-
<exclusion>
85-
<groupId>com.sun.jersey</groupId>
86-
<artifactId>jersey-client</artifactId>
87-
</exclusion>
88-
<exclusion>
89-
<groupId>javax.ws.rs</groupId>
90-
<artifactId>jsr311-api</artifactId>
91-
</exclusion>
92-
<exclusion>
93-
<groupId>com.sun.jersey</groupId>
94-
<artifactId>jersey-core</artifactId>
95-
</exclusion>
96-
<exclusion>
97-
<groupId>com.sun.jersey</groupId>
98-
<artifactId>jersey-json</artifactId>
99-
</exclusion>
100-
<exclusion>
101-
<groupId>com.sun.jersey</groupId>
102-
<artifactId>jersey-server</artifactId>
103-
</exclusion>
104-
<exclusion>
105-
<groupId>org.codehaus.jackson</groupId>
106-
<artifactId>jackson-core-asl</artifactId>
107-
</exclusion>
108-
<exclusion>
109-
<groupId>org.codehaus.jackson</groupId>
110-
<artifactId>jackson-mapper-asl</artifactId>
111-
</exclusion>
112-
<exclusion>
113-
<groupId>org.codehaus.jackson</groupId>
114-
<artifactId>jackson-jaxrs</artifactId>
115-
</exclusion>
116-
<exclusion>
117-
<groupId>org.codehaus.jackson</groupId>
118-
<artifactId>jackson-xc</artifactId>
119-
</exclusion>
120-
</exclusions>
121-
</dependency>
122-
12356
<dependency>
12457
<groupId>org.springframework.boot</groupId>
12558
<artifactId>spring-boot-starter-test</artifactId>

‎dolphinscheduler-worker/pom.xml

+67
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,73 @@
8181
<artifactId>dolphinscheduler-extract-worker</artifactId>
8282
</dependency>
8383

84+
<dependency>
85+
<groupId>org.apache.dolphinscheduler</groupId>
86+
<artifactId>dolphinscheduler-yarn-aop</artifactId>
87+
<exclusions>
88+
<exclusion>
89+
<groupId>aopalliance</groupId>
90+
<artifactId>aopalliance</artifactId>
91+
</exclusion>
92+
<exclusion>
93+
<groupId>com.google.inject</groupId>
94+
<artifactId>guice</artifactId>
95+
</exclusion>
96+
<exclusion>
97+
<groupId>com.google.inject.extensions</groupId>
98+
<artifactId>guice-servlet</artifactId>
99+
</exclusion>
100+
<exclusion>
101+
<groupId>javax.inject</groupId>
102+
<artifactId>javax.inject</artifactId>
103+
</exclusion>
104+
<exclusion>
105+
<groupId>com.sun.xml.bind</groupId>
106+
<artifactId>jaxb-impl</artifactId>
107+
</exclusion>
108+
<exclusion>
109+
<groupId>com.sun.jersey.contribs</groupId>
110+
<artifactId>jersey-guice</artifactId>
111+
</exclusion>
112+
<exclusion>
113+
<groupId>com.sun.jersey</groupId>
114+
<artifactId>jersey-client</artifactId>
115+
</exclusion>
116+
<exclusion>
117+
<groupId>javax.ws.rs</groupId>
118+
<artifactId>jsr311-api</artifactId>
119+
</exclusion>
120+
<exclusion>
121+
<groupId>com.sun.jersey</groupId>
122+
<artifactId>jersey-core</artifactId>
123+
</exclusion>
124+
<exclusion>
125+
<groupId>com.sun.jersey</groupId>
126+
<artifactId>jersey-json</artifactId>
127+
</exclusion>
128+
<exclusion>
129+
<groupId>com.sun.jersey</groupId>
130+
<artifactId>jersey-server</artifactId>
131+
</exclusion>
132+
<exclusion>
133+
<groupId>org.codehaus.jackson</groupId>
134+
<artifactId>jackson-core-asl</artifactId>
135+
</exclusion>
136+
<exclusion>
137+
<groupId>org.codehaus.jackson</groupId>
138+
<artifactId>jackson-mapper-asl</artifactId>
139+
</exclusion>
140+
<exclusion>
141+
<groupId>org.codehaus.jackson</groupId>
142+
<artifactId>jackson-jaxrs</artifactId>
143+
</exclusion>
144+
<exclusion>
145+
<groupId>org.codehaus.jackson</groupId>
146+
<artifactId>jackson-xc</artifactId>
147+
</exclusion>
148+
</exclusions>
149+
</dependency>
150+
84151
<dependency>
85152
<groupId>org.springframework.boot</groupId>
86153
<artifactId>spring-boot-starter</artifactId>

‎dolphinscheduler-aop/pom.xml ‎dolphinscheduler-yarn-aop/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<artifactId>dolphinscheduler</artifactId>
2424
<version>dev-SNAPSHOT</version>
2525
</parent>
26-
<artifactId>dolphinscheduler-aop</artifactId>
26+
<artifactId>dolphinscheduler-yarn-aop</artifactId>
2727
<packaging>jar</packaging>
2828
<name>${project.artifactId}</name>
2929
<description>aop 4 YarnClient to get application id when submitting jars using 'yarn jar mainClass args'</description>

‎dolphinscheduler-aop/src/main/java/org/apache/dolphinscheduler/aop/YarnClientAspect.java ‎dolphinscheduler-yarn-aop/src/main/java/org/apache/dolphinscheduler/aop/YarnClientAspect.java

File renamed without changes.

‎dolphinscheduler-aop/src/main/resources/META-INF/aop.xml ‎dolphinscheduler-yarn-aop/src/main/resources/META-INF/aop.xml

File renamed without changes.

‎dolphinscheduler-aop/src/main/resources/log4j.properties ‎dolphinscheduler-yarn-aop/src/main/resources/log4j.properties

File renamed without changes.

‎dolphinscheduler-aop/src/test/java/org/apache/dolphinscheduler/YarnClientAspectMocTest.java ‎dolphinscheduler-yarn-aop/src/test/java/org/apache/dolphinscheduler/YarnClientAspectMocTest.java

File renamed without changes.

‎dolphinscheduler-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientAspectMoc.java ‎dolphinscheduler-yarn-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientAspectMoc.java

File renamed without changes.

‎dolphinscheduler-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientMoc.java ‎dolphinscheduler-yarn-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientMoc.java

File renamed without changes.

‎dolphinscheduler-aop/src/test/resources/log4j.properties ‎dolphinscheduler-yarn-aop/src/test/resources/log4j.properties

File renamed without changes.

‎pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<module>dolphinscheduler-task-plugin</module>
4141
<module>dolphinscheduler-common</module>
4242
<module>dolphinscheduler-api</module>
43-
<module>dolphinscheduler-aop</module>
43+
<module>dolphinscheduler-yarn-aop</module>
4444
<module>dolphinscheduler-dao</module>
4545
<module>dolphinscheduler-dist</module>
4646
<module>dolphinscheduler-service</module>
@@ -137,7 +137,7 @@
137137

138138
<dependency>
139139
<groupId>org.apache.dolphinscheduler</groupId>
140-
<artifactId>dolphinscheduler-aop</artifactId>
140+
<artifactId>dolphinscheduler-yarn-aop</artifactId>
141141
<version>${project.version}</version>
142142
</dependency>
143143
<dependency>

‎tools/dependencies/known-dependencies.txt

-1
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,6 @@ azure-security-keyvault-keys-4.5.4.jar
429429
azure-security-keyvault-secrets-4.5.4.jar
430430
azure-storage-common-12.20.0.jar
431431
azure-storage-file-share-12.17.0.jar
432-
nimbus-jose-jwt-9.22.jar
433432
woodstox-core-6.4.0.jar
434433
azure-core-management-1.10.1.jar
435434
api-common-2.6.0.jar

0 commit comments

Comments
 (0)