Refactored some dependencies

Author: Caideyipi

LICENSE

@@ -317,4 +317,16 @@ The following files include code modified from Dropwizard Metrics project.
 
 Copyright (c) 2010-2013 Coda Hale, Yammer.com, 2014-2021 Dropwizard Team
 Project page: https://github.com/dropwizard/metrics
-License: https://github.com/dropwizard/metrics/blob/release/4.2.x/LICENSE
+License: https://github.com/dropwizard/metrics/blob/release/4.2.x/LICENSE
+
+--------------------------------------------------------------------------------
+
+The following files include code modified from Apache Commons Collections project.
+
+./iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/external/collections4/*
+
+Apache Commons Collections is open source software licensed under the Apache License 2.0 and supported by the Apache Software Foundation.
+Project page: https://github.com/apache/commons-collections
+License: https://github.com/apache/commons-collections/blob/master/LICENSE.txt
+
+--------------------------------------------------------------------------------

LICENSE-binary

@@ -216,10 +216,6 @@ following license. See licenses/ for text of these licenses.
 Apache Software Foundation License 2.0
 --------------------------------------
 commons-cli:commons-cli:1.5.0
-commons-codec:commons-codec:1.16.1
-org.apache.commons:commons-collections4:4.4
-commons-io:commons-io:2.14.0
-org.apache.commons:commons-lang3:3.18.0
 com.nimbusds:content-type:2.2
 com.google.code.gson:gson:2.13.1
 com.google.guava.guava:32.1.2-jre

dependencies.json

@@ -43,7 +43,7 @@
     "com.zaxxer:HikariCP",
     "commons-cli:commons-cli",
     "commons-codec:commons-codec",
-    "commons-io:commons-io",
+    "commons-codec:commons-codec",
     "commons-logging:commons-logging",
     "io.airlift:airline",
     "io.airlift:units",
@@ -67,11 +67,17 @@
     "io.netty:netty-resolver-dns-classes-macos",
     "io.netty:netty-resolver-dns-native-macos",
     "io.netty:netty-tcnative-boringssl-static",
+    "io.netty:netty-tcnative-boringssl-static",
+    "io.netty:netty-tcnative-boringssl-static",
+    "io.netty:netty-tcnative-boringssl-static",
+    "io.netty:netty-tcnative-boringssl-static",
     "io.netty:netty-tcnative-classes",
     "io.netty:netty-transport",
     "io.netty:netty-transport-classes-epoll",
     "io.netty:netty-transport-classes-kqueue",
     "io.netty:netty-transport-native-epoll",
+    "io.netty:netty-transport-native-epoll",
+    "io.netty:netty-transport-native-kqueue",
     "io.netty:netty-transport-native-kqueue",
     "io.netty:netty-transport-native-unix-common",
     "io.projectreactor:reactor-core",
@@ -92,10 +98,10 @@
     "net.minidev:accessors-smart",
     "net.minidev:json-smart",
     "org.antlr:antlr4-runtime",
-    "org.apache.commons:commons-collections4",
     "org.apache.commons:commons-csv",
     "org.apache.commons:commons-jexl3",
     "org.apache.commons:commons-lang3",
+    "org.apache.commons:commons-lang3",
     "org.apache.commons:commons-math3",
     "org.apache.commons:commons-pool2",
     "org.apache.httpcomponents:httpclient",
@@ -108,6 +114,7 @@
     "org.bouncycastle:bcprov-jdk18on",
     "org.bouncycastle:bcutil-jdk18on",
     "org.checkerframework:checker-qual",
+    "org.checkerframework:checker-qual",
     "org.eclipse.collections:eclipse-collections",
     "org.eclipse.collections:eclipse-collections-api",
     "org.eclipse.jetty:jetty-http",
@@ -162,4 +169,4 @@
     "org.yaml:snakeyaml",
     "pl.edu.icm:JLargeArrays"
   ]
-}
+}

example/mqtt-customize/src/main/java/org/apache/iotdb/mqtt/server/CustomizedJsonPayloadFormatter.java

@@ -24,7 +24,7 @@
 import org.apache.iotdb.db.protocol.mqtt.TreeMessage;
 
 import io.netty.buffer.ByteBuf;
-import org.apache.commons.lang3.NotImplementedException;
+import org.apache.tsfile.external.commons.lang3.NotImplementedException;
 
 import java.util.ArrayList;
 import java.util.Arrays;

integration-test/import-control.xml

@@ -62,7 +62,7 @@
         <allow class="org.apache.iotdb.commons.path.PathDeserializeUtil"/>
         <allow class="org.apache.tsfile.utils.PublicBAOS"/>
         <allow class="org.apache.iotdb.commons.exception.IllegalPathException"/>
-        <allow class="org.apache.commons.codec.digest.DigestUtils"/>
+        <allow class="org.apache.tsfile.external.commons.codec.digest.DigestUtils"/>
         <allow class="org.apache.iotdb.commons.trigger.service.TriggerExecutableManager"/>
         <allow class="org.apache.iotdb.db.queryengine.plan.statement.AuthorType"/>
         <allow class="org.apache.iotdb.commons.trigger.TriggerInformation"/>

integration-test/pom.xml

@@ -157,18 +157,10 @@
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
         <dependency>
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>
@@ -188,10 +180,6 @@
             <artifactId>iotdb-cli</artifactId>
             <version>2.0.6-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk18on</artifactId>

integration-test/src/main/java/org/apache/iotdb/it/env/cluster/ClusterConstant.java

@@ -19,7 +19,7 @@
 
 package org.apache.iotdb.it.env.cluster;
 
-import org.apache.commons.lang3.SystemUtils;
+import org.apache.tsfile.external.commons.lang3.SystemUtils;
 
 import java.io.File;
 

integration-test/src/main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java

@@ -21,7 +21,7 @@
 
 import org.apache.iotdb.it.framework.IoTDBTestLogger;
 
-import org.apache.commons.lang3.SystemUtils;
+import org.apache.tsfile.external.commons.lang3.SystemUtils;
 import org.apache.tsfile.utils.Pair;
 
 import java.io.*;

integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/AINodeWrapper.java

@@ -22,7 +22,7 @@
 import org.apache.iotdb.it.env.cluster.config.MppJVMConfig;
 import org.apache.iotdb.it.framework.IoTDBTestLogger;
 
-import org.apache.commons.io.file.PathUtils;
+import org.apache.tsfile.external.commons.io.file.PathUtils;
 import org.slf4j.Logger;
 
 import java.io.BufferedWriter;

integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/AbstractNodeWrapper.java

@@ -28,9 +28,9 @@
 import org.apache.iotdb.it.framework.IoTDBTestLogger;
 import org.apache.iotdb.itbase.env.BaseNodeWrapper;
 
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.file.PathUtils;
-import org.apache.commons.lang3.SystemUtils;
+import org.apache.tsfile.external.commons.io.FileUtils;
+import org.apache.tsfile.external.commons.io.file.PathUtils;
+import org.apache.tsfile.external.commons.lang3.SystemUtils;
 import org.slf4j.Logger;
 
 import javax.annotation.Nullable;