github
/
DolphinScheduler
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Rename dolphinscheduler-aop to dolphinscheduler-yarn-aop (#16095)

upstream-dev
Wenjun Ruan 5 months ago committed by GitHub
parent
d675c28812
commit
3bc88e32c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 70 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      dolphinscheduler-dist/release-docs/LICENSE
  2. 67
      dolphinscheduler-tools/pom.xml
  3. 67
      dolphinscheduler-worker/pom.xml
  4. 2
      dolphinscheduler-yarn-aop/pom.xml
  5. 0
      dolphinscheduler-yarn-aop/src/main/java/org/apache/dolphinscheduler/aop/YarnClientAspect.java
  6. 0
      dolphinscheduler-yarn-aop/src/main/resources/META-INF/aop.xml
  7. 0
      dolphinscheduler-yarn-aop/src/main/resources/log4j.properties
  8. 0
      dolphinscheduler-yarn-aop/src/test/java/org/apache/dolphinscheduler/YarnClientAspectMocTest.java
  9. 0
      dolphinscheduler-yarn-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientAspectMoc.java
  10. 0
      dolphinscheduler-yarn-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientMoc.java
  11. 0
      dolphinscheduler-yarn-aop/src/test/resources/log4j.properties
  12. 4
      pom.xml
  13. 1
      tools/dependencies/known-dependencies.txt

1
dolphinscheduler-dist/release-docs/LICENSE vendored
Unescape View File

@ -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-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 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 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 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 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 auto-value-annotations 1.10.4: https://mvnrepository.com/artifact/com.google.auto.value/auto-value-annotations/1.10.4, Apache 2.0

67
dolphinscheduler-tools/pom.xml
Unescape View File

@ -53,73 +53,6 @@
<artifactId>dolphinscheduler-storage-all</artifactId> <artifactId>dolphinscheduler-storage-all</artifactId>
</dependency> </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> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>

67
dolphinscheduler-worker/pom.xml
Unescape View File

@ -81,6 +81,73 @@
<artifactId>dolphinscheduler-extract-worker</artifactId> <artifactId>dolphinscheduler-extract-worker</artifactId>
</dependency> </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> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId> <artifactId>spring-boot-starter</artifactId>

2
dolphinscheduler-aop/pom.xml → dolphinscheduler-yarn-aop/pom.xml
Unescape View File

@ -23,7 +23,7 @@
<artifactId>dolphinscheduler</artifactId> <artifactId>dolphinscheduler</artifactId>
<version>dev-SNAPSHOT</version> <version>dev-SNAPSHOT</version>
</parent> </parent>
<artifactId>dolphinscheduler-aop</artifactId> <artifactId>dolphinscheduler-yarn-aop</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<description>aop 4 YarnClient to get application id when submitting jars using 'yarn jar mainClass args'</description> <description>aop 4 YarnClient to get application id when submitting jars using 'yarn jar mainClass args'</description>

0
dolphinscheduler-aop/src/main/java/org/apache/dolphinscheduler/aop/YarnClientAspect.java → dolphinscheduler-yarn-aop/src/main/java/org/apache/dolphinscheduler/aop/YarnClientAspect.java
Unescape View File

0
dolphinscheduler-aop/src/main/resources/META-INF/aop.xml → dolphinscheduler-yarn-aop/src/main/resources/META-INF/aop.xml
Unescape View File

0
dolphinscheduler-aop/src/main/resources/log4j.properties → dolphinscheduler-yarn-aop/src/main/resources/log4j.properties
Unescape View File

0
dolphinscheduler-aop/src/test/java/org/apache/dolphinscheduler/YarnClientAspectMocTest.java → dolphinscheduler-yarn-aop/src/test/java/org/apache/dolphinscheduler/YarnClientAspectMocTest.java
Unescape View File

0
dolphinscheduler-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientAspectMoc.java → dolphinscheduler-yarn-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientAspectMoc.java
Unescape View File

0
dolphinscheduler-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientMoc.java → dolphinscheduler-yarn-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientMoc.java
Unescape View File

0
dolphinscheduler-aop/src/test/resources/log4j.properties → dolphinscheduler-yarn-aop/src/test/resources/log4j.properties
Unescape View File

4
pom.xml
Unescape View File

@ -40,7 +40,7 @@
<module>dolphinscheduler-task-plugin</module> <module>dolphinscheduler-task-plugin</module>
<module>dolphinscheduler-common</module> <module>dolphinscheduler-common</module>
<module>dolphinscheduler-api</module> <module>dolphinscheduler-api</module>
<module>dolphinscheduler-aop</module> <module>dolphinscheduler-yarn-aop</module>
<module>dolphinscheduler-dao</module> <module>dolphinscheduler-dao</module>
<module>dolphinscheduler-dist</module> <module>dolphinscheduler-dist</module>
<module>dolphinscheduler-service</module> <module>dolphinscheduler-service</module>
@ -137,7 +137,7 @@
<dependency> <dependency>
<groupId>org.apache.dolphinscheduler</groupId> <groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-aop</artifactId> <artifactId>dolphinscheduler-yarn-aop</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>

1
tools/dependencies/known-dependencies.txt
Unescape View File

@ -429,7 +429,6 @@ azure-security-keyvault-keys-4.5.4.jar
azure-security-keyvault-secrets-4.5.4.jar azure-security-keyvault-secrets-4.5.4.jar
azure-storage-common-12.20.0.jar azure-storage-common-12.20.0.jar
azure-storage-file-share-12.17.0.jar azure-storage-file-share-12.17.0.jar
nimbus-jose-jwt-9.22.jar
woodstox-core-6.4.0.jar woodstox-core-6.4.0.jar
azure-core-management-1.10.1.jar azure-core-management-1.10.1.jar
api-common-2.6.0.jar api-common-2.6.0.jar

Write Preview
Loading…
Cancel
Save