This is an automated email from the ASF dual-hosted git repository.
totalo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git
The following commit(s) were added to refs/heads/master by this push:
new 6ca1a3a3d Refactor pom (#2360)
6ca1a3a3d is described below
commit 6ca1a3a3d3a19260ae6aef7d74cf78a94319e9d2
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Nov 1 05:43:02 2023 +0800
Refactor pom (#2360)
---
examples/elasticjob-example-java/pom.xml | 4 +-
examples/elasticjob-example-spring/pom.xml | 4 +-
examples/pom.xml | 6 +-
pom.xml | 192 +++++++++++++++--------------
spring/boot-starter/pom.xml | 2 +-
spring/pom.xml | 8 ++
6 files changed, 113 insertions(+), 103 deletions(-)
diff --git a/examples/elasticjob-example-java/pom.xml
b/examples/elasticjob-example-java/pom.xml
index 3db6224cb..88190535a 100644
--- a/examples/elasticjob-example-java/pom.xml
+++ b/examples/elasticjob-example-java/pom.xml
@@ -85,8 +85,8 @@
<artifactId>h2</artifactId>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/examples/elasticjob-example-spring/pom.xml
b/examples/elasticjob-example-spring/pom.xml
index bdba0392f..ca6fdf3b1 100644
--- a/examples/elasticjob-example-spring/pom.xml
+++ b/examples/elasticjob-example-spring/pom.xml
@@ -89,8 +89,8 @@
<artifactId>h2</artifactId>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/examples/pom.xml b/examples/pom.xml
index 202e49640..a919a8399 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -112,9 +112,9 @@
<version>${h2.version}</version>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql-connector-java}</version>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
+ <version>${mysql-connector-java.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/pom.xml b/pom.xml
index e7d3339cf..8ef6e35f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,40 +62,38 @@
<j2objc-annotations.version>1.3</j2objc-annotations.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
- <commons-codec.version>1.16.0</commons-codec.version>
- <commons-exec.version>1.3</commons-exec.version>
-
<snakeyaml.version>2.2</snakeyaml.version>
<gson.version>2.10.1</gson.version>
<quartz.version>2.3.2</quartz.version>
+
<zookeeper.version>3.9.0</zookeeper.version>
<curator.version>5.5.0</curator.version>
- <aspectj.version>1.9.1</aspectj.version>
+ <mail.version>1.6.0</mail.version>
+ <commons-codec.version>1.16.0</commons-codec.version>
+ <commons-exec.version>1.3</commons-exec.version>
<httpclient.version>4.5.14</httpclient.version>
<httpcore.version>4.4.16</httpcore.version>
+
<netty.version>4.1.99.Final</netty.version>
<slf4j.version>1.7.36</slf4j.version>
<logback.version>1.2.12</logback.version>
- <commons-dbcp2.version>2.10.0</commons-dbcp2.version>
- <commons-pool2.version>2.11.1</commons-pool2.version>
- <hikari-cp.version>4.0.3</hikari-cp.version>
- <mail.version>1.6.0</mail.version>
-
<lombok.version>1.18.30</lombok.version>
- <mysql-connector-java.version>8.0.31</mysql-connector-java.version>
- <h2.version>2.2.224</h2.version>
-
<junit.version>5.10.0</junit.version>
<hamcrest.version>2.2</hamcrest.version>
<mockito.version>4.11.0</mockito.version>
<awaitility.version>4.2.0</awaitility.version>
<bytebuddy.version>1.14.8</bytebuddy.version>
+ <h2.version>2.2.224</h2.version>
+ <hikari-cp.version>4.0.3</hikari-cp.version>
+ <commons-dbcp2.version>2.10.0</commons-dbcp2.version>
+ <commons-pool2.version>2.11.1</commons-pool2.version>
+
<!-- Compile plugin versions -->
<maven-enforcer-plugin.version>3.2.1</maven-enforcer-plugin.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
@@ -139,6 +137,7 @@
<artifactId>shardingsphere-infra-spi</artifactId>
<version>${shardingsphere.version}</version>
</dependency>
+
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -171,6 +170,17 @@
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>${snakeyaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>${gson.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
@@ -182,6 +192,7 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
@@ -210,46 +221,9 @@
</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>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jul-to-slf4j</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>${slf4j.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <version>${logback.version}</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ <version>${mail.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
@@ -271,16 +245,7 @@
<artifactId>httpcore</artifactId>
<version>${httpcore.version}</version>
</dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>${snakeyaml.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>${gson.version}</version>
- </dependency>
+
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
@@ -290,24 +255,41 @@
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-dbcp2</artifactId>
- <version>${commons-dbcp2.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- <version>${commons-pool2.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>com.zaxxer</groupId>
- <artifactId>HikariCP</artifactId>
- <version>${hikari-cp.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- <version>${mail.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>${slf4j.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>${logback.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -317,24 +299,6 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>${h2.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
- <version>${hamcrest.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
- <version>${aspectj.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
@@ -343,9 +307,9 @@
<scope>import</scope>
</dependency>
<dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <version>${awaitility.version}</version>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -377,6 +341,35 @@
<version>${bytebuddy.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <version>${awaitility.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${h2.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP</artifactId>
+ <version>${hikari-cp.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-dbcp2</artifactId>
+ <version>${commons-dbcp2.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ <version>${commons-pool2.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -385,10 +378,19 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
diff --git a/spring/boot-starter/pom.xml b/spring/boot-starter/pom.xml
index d747fdf58..7fa77d570 100644
--- a/spring/boot-starter/pom.xml
+++ b/spring/boot-starter/pom.xml
@@ -59,10 +59,10 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
diff --git a/spring/pom.xml b/spring/pom.xml
index 6357ab8d9..bec630362 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -36,6 +36,7 @@
<properties>
<springboot.version>2.7.10</springboot.version>
<springframework.version>5.3.26</springframework.version>
+ <aspectj.version>1.9.1</aspectj.version>
</properties>
<dependencyManagement>
@@ -71,6 +72,13 @@
<version>${springframework.version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>${aspectj.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
