This is an automated email from the ASF dual-hosted git repository. technoboy 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 3b88d31 Unify dependencies' version and exclude unnecessary dependencies (#1709) 3b88d31 is described below commit 3b88d317f3fd52b0a68b1ebddbfe0b3ad1a45568 Author: 吴伟杰 <root496879...@me.com> AuthorDate: Wed Nov 11 23:13:12 2020 +0800 Unify dependencies' version and exclude unnecessary dependencies (#1709) * Add jul-to-slf4j to dependencyManagement * Keep the version of Netty in dependencyManagement consistent with Curator 5.1.0 * Add Netty components to dependencyManagement * Exclude unused junit jupiter from Spring Boot Starter * Unify commons-pool's version to 1.5.4 --- .../elasticjob-lite-spring-boot-starter/pom.xml | 18 +++++++ pom.xml | 57 +++++++++++++++++++++- 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/pom.xml b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/pom.xml index d986f10..ddf1a40 100644 --- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/pom.xml +++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/pom.xml @@ -61,6 +61,24 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </exclusion> + <exclusion> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + </exclusion> + <exclusion> + <groupId>org.mockito</groupId> + <artifactId>mockito-junit-jupiter</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> </dependency> <dependency> <groupId>org.apache.curator</groupId> diff --git a/pom.xml b/pom.xml index 59108b6..ffbdcb3 100644 --- a/pom.xml +++ b/pom.xml @@ -61,11 +61,12 @@ <httpcore.version>4.4.13</httpcore.version> <snakeyaml.version>1.26</snakeyaml.version> <gson.version>2.6.1</gson.version> - <netty.version>4.1.52.Final</netty.version> + <netty.version>4.1.45.Final</netty.version> <mesos.version>1.1.0</mesos.version> <fenzo.version>0.11.1</fenzo.version> <commons-dbcp.version>1.4</commons-dbcp.version> + <commons-pool.version>1.5.4</commons-pool.version> <mail.version>1.6.0</mail.version> <mysql-connector-java.version>8.0.16</mysql-connector-java.version> @@ -165,6 +166,11 @@ </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> @@ -217,7 +223,49 @@ </dependency> <dependency> <groupId>io.netty</groupId> - <artifactId>netty-codec-http</artifactId> + <artifactId>netty-bom</artifactId> + <version>${netty.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-buffer</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-common</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-resolver</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-epoll</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-unix-common</artifactId> <version>${netty.version}</version> </dependency> @@ -237,6 +285,11 @@ <version>${commons-dbcp.version}</version> </dependency> <dependency> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + <version>${commons-pool.version}</version> + </dependency> + <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> <version>${mail.version}</version>