This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch remove_commons_lang2.6 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 526bc759a692bb808a624eb3ae3baf47a76393a0 Author: HTHou <[email protected]> AuthorDate: Tue Aug 15 15:47:41 2023 +0800 Replace dependency commons-lang-2.6 to commons-lang3 --- distribution/pom.xml | 6 ------ .../main/java/org/apache/iotdb/consensus/ratis/SnapshotStorage.java | 2 +- iotdb-core/datanode/pom.xml | 4 ---- .../db/pipe/connector/protocol/legacy/IoTDBLegacyPipeConnector.java | 2 +- .../java/org/apache/iotdb/db/protocol/session/SessionManager.java | 2 +- .../apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java | 2 +- .../iotdb/db/queryengine/plan/planner/LogicalPlanBuilder.java | 2 +- iotdb-core/node-commons/pom.xml | 5 ----- .../java/org/apache/iotdb/commons/path/fa/dfa/graph/NFAGraph.java | 2 +- pom.xml | 6 ------ 10 files changed, 6 insertions(+), 27 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index 1fb56662239..7a0b0ab9107 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -109,12 +109,6 @@ <version>${project.version}</version> <type>zip</type> </dependency> - <dependency> - <groupId>org.apache.iotdb</groupId> - <artifactId>iotdb-grafana-connector</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> <dependency> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-grafana-plugin</artifactId> diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/SnapshotStorage.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/SnapshotStorage.java index 4beae2ded80..a2b59557a26 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/SnapshotStorage.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/SnapshotStorage.java @@ -22,7 +22,7 @@ package org.apache.iotdb.consensus.ratis; import org.apache.iotdb.consensus.IStateMachine; import org.apache.iotdb.consensus.ratis.utils.Utils; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.apache.ratis.protocol.RaftGroupId; import org.apache.ratis.server.protocol.TermIndex; import org.apache.ratis.server.storage.FileInfo; diff --git a/iotdb-core/datanode/pom.xml b/iotdb-core/datanode/pom.xml index 375781bb686..c199bf4827a 100644 --- a/iotdb-core/datanode/pom.xml +++ b/iotdb-core/datanode/pom.xml @@ -336,10 +336,6 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/legacy/IoTDBLegacyPipeConnector.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/legacy/IoTDBLegacyPipeConnector.java index 6c493b3e4c9..5b251a4947d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/legacy/IoTDBLegacyPipeConnector.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/legacy/IoTDBLegacyPipeConnector.java @@ -48,7 +48,7 @@ import org.apache.iotdb.service.rpc.thrift.TSyncTransportMetaInfo; import org.apache.iotdb.session.pool.SessionPool; import org.apache.iotdb.tsfile.write.record.Tablet; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java index aa604d2f5fb..fe3a61e6ac2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java @@ -43,7 +43,7 @@ import org.apache.iotdb.service.rpc.thrift.TSConnectionInfo; import org.apache.iotdb.service.rpc.thrift.TSConnectionInfoResp; import org.apache.iotdb.service.rpc.thrift.TSProtocolVersion; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java index 25e7d3db2c6..1961f3fe2c4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java @@ -176,7 +176,7 @@ import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; import io.airlift.units.Duration; import io.jsonwebtoken.lang.Strings; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanBuilder.java index 0b80f58961c..8914c948fab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanBuilder.java @@ -99,7 +99,7 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.read.filter.basic.Filter; import com.google.common.base.Function; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import java.time.ZoneId; import java.util.ArrayList; diff --git a/iotdb-core/node-commons/pom.xml b/iotdb-core/node-commons/pom.xml index 542fe10a26c..e939a8130c3 100644 --- a/iotdb-core/node-commons/pom.xml +++ b/iotdb-core/node-commons/pom.xml @@ -180,11 +180,6 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <scope>compile</scope> - </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/fa/dfa/graph/NFAGraph.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/fa/dfa/graph/NFAGraph.java index 47020e6b6ed..fa6299167e6 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/fa/dfa/graph/NFAGraph.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/fa/dfa/graph/NFAGraph.java @@ -25,7 +25,7 @@ import org.apache.iotdb.commons.path.fa.IFATransition; import org.apache.iotdb.commons.path.fa.dfa.DFAState; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; import java.util.List; diff --git a/pom.xml b/pom.xml index 1ca78c7c380..62cdc178ab7 100644 --- a/pom.xml +++ b/pom.xml @@ -196,7 +196,6 @@ <!-- caffeine cache --> <caffeine>2.9.3</caffeine> <commons-csv.version>1.9.0</commons-csv.version> - <commons-lang.version>2.6</commons-lang.version> <JTransforms.version>3.1</JTransforms.version> <xz.version>1.9</xz.version> <!-- codegen --> @@ -603,11 +602,6 @@ <artifactId>commons-csv</artifactId> <version>${commons-csv.version}</version> </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>${commons-lang.version}</version> - </dependency> <dependency> <groupId>com.github.wendykierp</groupId> <artifactId>JTransforms</artifactId>
