[update][core] remove commons-logging

when commons-logging bump from 1.2 to 1.3.0, it causes the hdfs(reader,writer) plugin reporting class not found exception
wgzhao · May 29, 2024 · 6c7ea46 · 6c7ea46
1 parent 07791e7
commit 6c7ea46
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 25 deletions.
diff --git a/common/src/main/java/com/wgzhao/addax/common/compress/ExpandLzopInputStream.java b/common/src/main/java/com/wgzhao/addax/common/compress/ExpandLzopInputStream.java
@@ -36,8 +36,8 @@
 import org.anarres.lzo.LzoVersion;
 import org.anarres.lzo.LzopConstants;
 import org.anarres.lzo.LzopInputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nonnegative;
 import javax.annotation.Nonnull;
@@ -70,7 +70,7 @@ protected int readHeader()
             throws IOException
     {
         short lzoLibraryVersion = 0x2060;
-        Log log = LogFactory.getLog(LzopInputStream.class);
+        Logger log =  LoggerFactory.getLogger(LzopInputStream.class);
         byte[] lzopMagic = {-119, 'L', 'Z', 'O', 0, '\r', '\n', '\032', '\n'};
         byte[] buf = new byte[9];
         readBytes(buf, 0, 9);
@@ -82,9 +82,8 @@ protected int readHeader()
         CRC32 crc32 = new CRC32();
         int hitem = readHeaderItem(buf, 2, adler, crc32); // lzop version
         if (hitem > LzopConstants.LZOP_VERSION) {
-            log.debug("Compressed with later version of lzop: "
-                    + Integer.toHexString(hitem) + " (expected 0x"
-                    + Integer.toHexString(LzopConstants.LZOP_VERSION) + ")");
+            log.debug("Compressed with later version of lzop: {} (expected 0x{})",
+                    Integer.toHexString(hitem), Integer.toHexString(LzopConstants.LZOP_VERSION));
         }
         hitem = readHeaderItem(buf, 2, adler, crc32); // lzo library version
         if (hitem > lzoLibraryVersion) {

diff --git a/plugin/reader/hbase20xreader/pom.xml b/plugin/reader/hbase20xreader/pom.xml
@@ -36,12 +36,6 @@
             <version>${protobuf.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>${commons.logging.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>

diff --git a/plugin/writer/databendwriter/pom.xml b/plugin/writer/databendwriter/pom.xml
@@ -48,12 +48,6 @@
             <version>${commons.codec.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>${commons.logging.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.databend</groupId>
             <artifactId>databend-jdbc</artifactId>

diff --git a/plugin/writer/starrockswriter/pom.xml b/plugin/writer/starrockswriter/pom.xml
@@ -48,12 +48,6 @@
             <version>${commons.codec.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>${commons.logging.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -41,7 +41,6 @@
         <commons.csv.version>1.10.0</commons.csv.version>
         <commons.io.version>2.15.1</commons.io.version>
         <commons.lang3.version>3.14.0</commons.lang3.version>
-        <commons.logging.version>1.3.0</commons.logging.version>
         <commons.net.version>3.10.0</commons.net.version>
         <commons.rng.version>1.5</commons.rng.version>
         <diamond.version>3.7.3</diamond.version>