Skip to content

Commit

Permalink
Merge pull request #2291 from terrymanu/dev
Browse files Browse the repository at this point in the history
Refactor elasticjob-infra module
  • Loading branch information
taojintianxia authored Oct 14, 2023
2 parents aff58de + 3d4f604 commit 4754f91
Show file tree
Hide file tree
Showing 213 changed files with 56 additions and 89 deletions.
2 changes: 1 addition & 1 deletion ecosystem/error-handler/spi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
<artifactId>elasticjob-infra-common</artifactId>
<artifactId>elasticjob-infra</artifactId>
<version>${project.parent.version}</version>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ecosystem/error-handler/type/general/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
<artifactId>elasticjob-infra-common</artifactId>
<artifactId>elasticjob-infra</artifactId>
<version>${project.parent.version}</version>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion ecosystem/executor/kernel/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
<artifactId>elasticjob-infra-common</artifactId>
<artifactId>elasticjob-infra</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ecosystem/tracing/api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
<artifactId>elasticjob-infra-common</artifactId>
<artifactId>elasticjob-infra</artifactId>
<version>${project.parent.version}</version>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion engine/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
<artifactId>elasticjob-infra-common</artifactId>
<artifactId>elasticjob-infra</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
Expand Down
75 changes: 0 additions & 75 deletions infra/common/pom.xml

This file was deleted.

52 changes: 46 additions & 6 deletions infra/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,52 @@
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>elasticjob-infra</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>

<modules>
<module>common</module>
<module>registry-center</module>
<module>restful</module>
</modules>
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
<artifactId>elasticjob-api</artifactId>
<version>${project.parent.version}</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
File renamed without changes.
2 changes: 2 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
<module>api</module>
<module>infra</module>
<module>engine</module>
<module>registry-center</module>
<module>restful</module>
<module>ecosystem</module>

<module>distribution</module>
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion infra/registry-center/pom.xml → registry-center/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
<artifactId>elasticjob-infra</artifactId>
<artifactId>elasticjob</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>elasticjob-registry-center</artifactId>
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions infra/restful/pom.xml → restful/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
<artifactId>elasticjob-infra</artifactId>
<artifactId>elasticjob</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>elasticjob-restful</artifactId>
Expand All @@ -29,7 +29,7 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
<artifactId>elasticjob-infra-common</artifactId>
<artifactId>elasticjob-infra</artifactId>
<version>${project.parent.version}</version>
</dependency>

Expand Down

0 comments on commit 4754f91

Please sign in to comment.