pom 优化

dlink-admin/pom.xml

@@ -66,7 +66,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-log4j2</artifactId>
             <exclusions>
@@ -75,12 +75,19 @@
                     <artifactId>slf4j-api</artifactId>
                 </exclusion>
             </exclusions>
+        </dependency>-->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
         </dependency>
-        <!--<dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.30</version>
-        </dependency>-->
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>

dlink-admin/src/main/resources/log4j2.xml

@@ -39,10 +39,4 @@
             <appender-ref ref="RollingFile"/>
         </root>
     </loggers>
-    <!--打印sql日志使用的，additivity是Logger是否继承root中的appender-ref定义的输出位置的标志，默认情况下Logger会继承，若是additivity设为false，则Logger只会在自己标签中的appender-ref里输出，不会在root中的指定的appender-ref里输出，若是additivity设为true，则还会把sql日志输出在root中指定的appender-ref中；level="debug"的原因是Mybatis中SQL语句的日志级别被设为DEBUG，SQL执行结果的日志级别为TRACE，只要将日志级别调整为DEBUG就可以输出SQL语句，而不会输出SQL执行结果-->
-    <logger name="com.dlink.mapper" level="debug" additivity="false">
-        <appender-ref ref="Console"/>
-        <appender-ref ref="RollingFile"/>
-    </logger>
-
 </configuration>

dlink-client/dlink-client-1.11/pom.xml

@@ -73,8 +73,6 @@
         <dependency>
             <groupId>com.dlink</groupId>
             <artifactId>dlink-client-hadoop</artifactId>
-            <version>${project.version}</version>
-            <scope>${scope.runtime}</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>

dlink-client/dlink-client-1.12/pom.xml

@@ -74,8 +74,6 @@
         <dependency>
             <groupId>com.dlink</groupId>
             <artifactId>dlink-client-hadoop</artifactId>
-            <version>${project.version}</version>
-            <scope>${scope.runtime}</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>

dlink-client/dlink-client-1.13/pom.xml

@@ -74,8 +74,6 @@
         <dependency>
             <groupId>com.dlink</groupId>
             <artifactId>dlink-client-hadoop</artifactId>
-            <version>${project.version}</version>
-            <scope>${scope.runtime}</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>

dlink-client/dlink-client-1.14/pom.xml

@@ -73,8 +73,6 @@
         <dependency>
             <groupId>com.dlink</groupId>
             <artifactId>dlink-client-hadoop</artifactId>
-            <version>${project.version}</version>
-            <scope>${scope.runtime}</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>

dlink-client/dlink-client-hadoop/pom.xml

@@ -13,7 +13,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!--<scope.type>provided</scope.type>-->
-        <hadoop.version>3.1.0</hadoop.version>
+        <hadoop.version>2.7.7</hadoop.version>
         <scope.type>compile</scope.type>
     </properties>
 
@@ -26,6 +26,10 @@
                     <groupId>com.google.guava</groupId>
                     <artifactId>guava</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
             </exclusions>
             <version>${hadoop.version}</version>
         </dependency>
@@ -39,6 +43,10 @@
                     <groupId>com.google.guava</groupId>
                     <artifactId>guava</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -51,6 +59,10 @@
                     <groupId>com.google.guava</groupId>
                     <artifactId>guava</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -69,6 +81,10 @@
                     <groupId>com.google.guava</groupId>
                     <artifactId>guava</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -81,6 +97,10 @@
                     <groupId>com.google.guava</groupId>
                     <artifactId>guava</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
     </dependencies>

pom.xml

@@ -38,7 +38,7 @@
         <lombok.version>1.18.16</lombok.version>
         <jackjson.version>2.11.4</jackjson.version>
         <guava.version>21.0</guava.version>
-        <slf4j.version>1.7.30</slf4j.version>
+        <log4j.version>2.17.1</log4j.version>
         <mysql-connector-java.version>8.0.22</mysql-connector-java.version>
         <ojdbc8.version>12.2.0.1</ojdbc8.version>
         <clickhouse.version>0.2.6</clickhouse.version>
@@ -51,8 +51,8 @@
         <maven-assembly-plugin.version>3.2.0</maven-assembly-plugin.version>
         <maven.resource.version>3.2.0</maven.resource.version>
         <junit.version>4.12</junit.version>
-        <!--  `provide` for product environment ,`compile` for dev environment  -->
-        <scope.runtime>compile</scope.runtime>
+        <!--  `provided` for product environment ,`compile` for dev environment  -->
+        <scope.runtime>provided</scope.runtime>
     </properties>
 
     <dependencyManagement>
@@ -102,16 +102,21 @@
                 <artifactId>guava</artifactId>
                 <version>${guava.version}</version>
             </dependency>
-            <!--<dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>${slf4j.version}</version>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-api</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-core</artifactId>
+                <version>${log4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-simple</artifactId>
-                <version>${slf4j.version}</version>
-            </dependency>-->
+                <artifactId>slf4j-log4j12</artifactId>
+                <version>1.7.30</version>
+            </dependency>
             <dependency>
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>
@@ -224,6 +229,11 @@
                 <artifactId>dlink-executor</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.dlink</groupId>
+                <artifactId>dlink-client-hadoop</artifactId>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <build>