From 3e5008f288e544ead6c9f03a108a1381709d4c88 Mon Sep 17 00:00:00 2001
From: vongosling <vongosling@apache.org>
Date: Wed, 29 Jul 2020 14:12:13 +0800
Subject: [PATCH] refactor(build): Remove duplicated logback-core dependency
 and update some modules to 1.8 compiler lever

---
 acl/pom.xml           |  9 ---------
 broker/pom.xml        |  4 ----
 client/pom.xml        |  5 -----
 common/pom.xml        |  5 -----
 example/pom.xml       | 24 +++++++++---------------
 logappender/pom.xml   |  5 -----
 logging/pom.xml       |  5 -----
 namesrv/pom.xml       |  8 ++------
 openmessaging/pom.xml |  4 ++--
 pom.xml               | 17 +++++++++++------
 remoting/pom.xml      |  5 -----
 store/pom.xml         |  5 -----
 test/pom.xml          |  1 -
 tools/pom.xml         |  4 ----
 14 files changed, 24 insertions(+), 77 deletions(-)

diff --git a/acl/pom.xml b/acl/pom.xml
index 33839f7c..ed5e709d 100644
--- a/acl/pom.xml
+++ b/acl/pom.xml
@@ -18,10 +18,6 @@
     <artifactId>rocketmq-acl</artifactId>
     <name>rocketmq-acl ${project.version}</name>
 
-    <url>http://maven.apache.org</url>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -62,11 +58,6 @@
             <artifactId>logback-classic</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>
diff --git a/broker/pom.xml b/broker/pom.xml
index f0a9f839..8d52edbf 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -54,10 +54,6 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
         </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
diff --git a/client/pom.xml b/client/pom.xml
index 2c86868e..c775ee8f 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -27,11 +27,6 @@
     <artifactId>rocketmq-client</artifactId>
     <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>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/common/pom.xml b/common/pom.xml
index 3897fa55..ad1a1801 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -27,11 +27,6 @@
     <artifactId>rocketmq-common</artifactId>
     <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>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/example/pom.xml b/example/pom.xml
index 32c69d25..4a427d57 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -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">
     <parent>
-        <groupId>org.apache.rocketmq</groupId>
         <artifactId>rocketmq-all</artifactId>
+        <groupId>org.apache.rocketmq</groupId>
         <version>4.8.0-SNAPSHOT</version>
     </parent>
 
@@ -37,26 +37,20 @@
             <artifactId>rocketmq-srvutil</artifactId>
         </dependency>
         <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>rocketmq-openmessaging</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.openmessaging</groupId>
-            <artifactId>openmessaging-api</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>rocketmq-acl</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.rocketmq</groupId>
-            <artifactId>rocketmq-openmessaging</artifactId>
-            <version>4.8.0-SNAPSHOT</version>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.rocketmq</groupId>
-            <artifactId>rocketmq-acl</artifactId>
-            <version>4.8.0-SNAPSHOT</version>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/logappender/pom.xml b/logappender/pom.xml
index 9031acc2..b67d6f70 100644
--- a/logappender/pom.xml
+++ b/logappender/pom.xml
@@ -42,11 +42,6 @@
             <artifactId>log4j-core</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
diff --git a/logging/pom.xml b/logging/pom.xml
index 9393bcdc..917e37a9 100644
--- a/logging/pom.xml
+++ b/logging/pom.xml
@@ -27,11 +27,6 @@
     <artifactId>rocketmq-logging</artifactId>
     <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>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/namesrv/pom.xml b/namesrv/pom.xml
index 2a22dfc7..9a7eb350 100644
--- a/namesrv/pom.xml
+++ b/namesrv/pom.xml
@@ -29,11 +29,11 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.rocketmq</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>rocketmq-client</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.rocketmq</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>rocketmq-tools</artifactId>
         </dependency>
         <dependency>
@@ -44,10 +44,6 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
         </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
diff --git a/openmessaging/pom.xml b/openmessaging/pom.xml
index 7f487419..8a0db607 100644
--- a/openmessaging/pom.xml
+++ b/openmessaging/pom.xml
@@ -22,8 +22,8 @@
         <groupId>org.apache.rocketmq</groupId>
         <version>4.8.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
+    <modelVersion>4.0.0</modelVersion>
     <artifactId>rocketmq-openmessaging</artifactId>
     <name>rocketmq-openmessaging ${project.version}</name>
 
@@ -33,7 +33,7 @@
             <artifactId>openmessaging-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.rocketmq</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>rocketmq-client</artifactId>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index bcab5ed9..2d0d9437 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,6 @@
         <module>namesrv</module>
         <module>remoting</module>
         <module>logappender</module>
-        <module>example</module>
         <module>srvutil</module>
         <module>filter</module>
         <module>test</module>
@@ -127,6 +126,7 @@
         <module>openmessaging</module>
         <module>logging</module>
         <module>acl</module>
+        <module>example</module>
     </modules>
 
     <build>
@@ -530,6 +530,16 @@
                 <artifactId>rocketmq-filter</artifactId>
                 <version>${project.version}</version>
             </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>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>rocketmq-example</artifactId>
@@ -550,11 +560,6 @@
                 <artifactId>logback-classic</artifactId>
                 <version>1.0.13</version>
             </dependency>
-            <dependency>
-                <groupId>ch.qos.logback</groupId>
-                <artifactId>logback-core</artifactId>
-                <version>1.0.13</version>
-            </dependency>
             <dependency>
                 <groupId>commons-cli</groupId>
                 <artifactId>commons-cli</artifactId>
diff --git a/remoting/pom.xml b/remoting/pom.xml
index e1d496db..27f44eab 100644
--- a/remoting/pom.xml
+++ b/remoting/pom.xml
@@ -27,11 +27,6 @@
     <artifactId>rocketmq-remoting</artifactId>
     <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>
         <dependency>
             <groupId>com.alibaba</groupId>
diff --git a/store/pom.xml b/store/pom.xml
index 0a5923a6..d7d0b9f0 100644
--- a/store/pom.xml
+++ b/store/pom.xml
@@ -56,10 +56,5 @@
             <artifactId>logback-classic</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/test/pom.xml b/test/pom.xml
index fae02f61..8fc5a712 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -31,7 +31,6 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/tools/pom.xml b/tools/pom.xml
index d4bc6b75..4c1b6475 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -56,10 +56,6 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
         </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-- 
GitLab