提交 3e5008f2 编写于 作者: V vongosling

refactor(build): Remove duplicated logback-core dependency and update some...

refactor(build): Remove duplicated logback-core dependency and update some modules to 1.8 compiler lever
上级 e58a6b2a
...@@ -18,10 +18,6 @@ ...@@ -18,10 +18,6 @@
<artifactId>rocketmq-acl</artifactId> <artifactId>rocketmq-acl</artifactId>
<name>rocketmq-acl ${project.version}</name> <name>rocketmq-acl ${project.version}</name>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
...@@ -62,11 +58,6 @@ ...@@ -62,11 +58,6 @@
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>commons-validator</groupId> <groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId> <artifactId>commons-validator</artifactId>
......
...@@ -54,10 +54,6 @@ ...@@ -54,10 +54,6 @@
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
</dependency> </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
......
...@@ -27,11 +27,6 @@ ...@@ -27,11 +27,6 @@
<artifactId>rocketmq-client</artifactId> <artifactId>rocketmq-client</artifactId>
<name>rocketmq-client ${project.version}</name> <name>rocketmq-client ${project.version}</name>
<properties>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
......
...@@ -27,11 +27,6 @@ ...@@ -27,11 +27,6 @@
<artifactId>rocketmq-common</artifactId> <artifactId>rocketmq-common</artifactId>
<name>rocketmq-common ${project.version}</name> <name>rocketmq-common ${project.version}</name>
<properties>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId> <artifactId>rocketmq-all</artifactId>
<groupId>org.apache.rocketmq</groupId>
<version>4.8.0-SNAPSHOT</version> <version>4.8.0-SNAPSHOT</version>
</parent> </parent>
...@@ -37,26 +37,20 @@ ...@@ -37,26 +37,20 @@
<artifactId>rocketmq-srvutil</artifactId> <artifactId>rocketmq-srvutil</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>${project.groupId}</groupId>
<artifactId>logback-classic</artifactId> <artifactId>rocketmq-openmessaging</artifactId>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.openmessaging</groupId> <groupId>${project.groupId}</groupId>
<artifactId>openmessaging-api</artifactId> <artifactId>rocketmq-acl</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.rocketmq</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>rocketmq-openmessaging</artifactId> <artifactId>logback-classic</artifactId>
<version>4.8.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.rocketmq</groupId> <groupId>org.javassist</groupId>
<artifactId>rocketmq-acl</artifactId> <artifactId>javassist</artifactId>
<version>4.8.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>
...@@ -42,11 +42,6 @@ ...@@ -42,11 +42,6 @@
<artifactId>log4j-core</artifactId> <artifactId>log4j-core</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
......
...@@ -27,11 +27,6 @@ ...@@ -27,11 +27,6 @@
<artifactId>rocketmq-logging</artifactId> <artifactId>rocketmq-logging</artifactId>
<name>rocketmq-logging ${project.version}</name> <name>rocketmq-logging ${project.version}</name>
<properties>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
......
...@@ -29,11 +29,11 @@ ...@@ -29,11 +29,11 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.rocketmq</groupId> <groupId>${project.groupId}</groupId>
<artifactId>rocketmq-client</artifactId> <artifactId>rocketmq-client</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.rocketmq</groupId> <groupId>${project.groupId}</groupId>
<artifactId>rocketmq-tools</artifactId> <artifactId>rocketmq-tools</artifactId>
</dependency> </dependency>
<dependency> <dependency>
...@@ -44,10 +44,6 @@ ...@@ -44,10 +44,6 @@
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
</dependency> </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
<groupId>org.apache.rocketmq</groupId> <groupId>org.apache.rocketmq</groupId>
<version>4.8.0-SNAPSHOT</version> <version>4.8.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion>
<artifactId>rocketmq-openmessaging</artifactId> <artifactId>rocketmq-openmessaging</artifactId>
<name>rocketmq-openmessaging ${project.version}</name> <name>rocketmq-openmessaging ${project.version}</name>
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<artifactId>openmessaging-api</artifactId> <artifactId>openmessaging-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.rocketmq</groupId> <groupId>${project.groupId}</groupId>
<artifactId>rocketmq-client</artifactId> <artifactId>rocketmq-client</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -119,7 +119,6 @@ ...@@ -119,7 +119,6 @@
<module>namesrv</module> <module>namesrv</module>
<module>remoting</module> <module>remoting</module>
<module>logappender</module> <module>logappender</module>
<module>example</module>
<module>srvutil</module> <module>srvutil</module>
<module>filter</module> <module>filter</module>
<module>test</module> <module>test</module>
...@@ -127,6 +126,7 @@ ...@@ -127,6 +126,7 @@
<module>openmessaging</module> <module>openmessaging</module>
<module>logging</module> <module>logging</module>
<module>acl</module> <module>acl</module>
<module>example</module>
</modules> </modules>
<build> <build>
...@@ -530,6 +530,16 @@ ...@@ -530,6 +530,16 @@
<artifactId>rocketmq-filter</artifactId> <artifactId>rocketmq-filter</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rocketmq-acl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rocketmq-openmessaging</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>rocketmq-example</artifactId> <artifactId>rocketmq-example</artifactId>
...@@ -550,11 +560,6 @@ ...@@ -550,11 +560,6 @@
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
<version>1.0.13</version> <version>1.0.13</version>
</dependency> </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.0.13</version>
</dependency>
<dependency> <dependency>
<groupId>commons-cli</groupId> <groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId> <artifactId>commons-cli</artifactId>
......
...@@ -27,11 +27,6 @@ ...@@ -27,11 +27,6 @@
<artifactId>rocketmq-remoting</artifactId> <artifactId>rocketmq-remoting</artifactId>
<name>rocketmq-remoting ${project.version}</name> <name>rocketmq-remoting ${project.version}</name>
<properties>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
......
...@@ -56,10 +56,5 @@ ...@@ -56,10 +56,5 @@
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
......
...@@ -56,10 +56,6 @@ ...@@ -56,10 +56,6 @@
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
</dependency> </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册