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 index 4f96a19f4..a6f09971d 100644 --- 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 index e1e100171..b42db0aa0 100644 --- a/plugin/reader/hbase20xreader/pom.xml +++ b/plugin/reader/hbase20xreader/pom.xml @@ -36,12 +36,6 @@ ${protobuf.version} - - commons-logging - commons-logging - ${commons.logging.version} - - org.apache.hadoop hadoop-common diff --git a/plugin/writer/databendwriter/pom.xml b/plugin/writer/databendwriter/pom.xml index bb2c1b068..fc97bb5b1 100755 --- a/plugin/writer/databendwriter/pom.xml +++ b/plugin/writer/databendwriter/pom.xml @@ -48,12 +48,6 @@ ${commons.codec.version} - - commons-logging - commons-logging - ${commons.logging.version} - - com.databend databend-jdbc diff --git a/plugin/writer/starrockswriter/pom.xml b/plugin/writer/starrockswriter/pom.xml index da9f68470..78acbaec9 100755 --- a/plugin/writer/starrockswriter/pom.xml +++ b/plugin/writer/starrockswriter/pom.xml @@ -48,12 +48,6 @@ ${commons.codec.version} - - commons-logging - commons-logging - ${commons.logging.version} - - mysql mysql-connector-java diff --git a/pom.xml b/pom.xml index e9083b416..e9a45ab1d 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,6 @@ 1.10.0 2.15.1 3.14.0 - 1.3.0 3.10.0 1.5 3.7.3