This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new f8056df [IOTDB-1176] jar package normalization - remove common-lang
and remain common-lang3 (#2737)
f8056df is described below
commit f8056df54e677c99a6b74e637dd90bbc4dbe5528
Author: wangchao316 <[email protected]>
AuthorDate: Thu Feb 25 21:37:37 2021 +0800
[IOTDB-1176] jar package normalization - remove common-lang and remain
common-lang3 (#2737)
---
pom.xml | 6 ------
server/pom.xml | 4 ----
.../src/main/java/org/apache/iotdb/db/mqtt/BrokerAuthenticator.java | 2 +-
.../java/org/apache/iotdb/db/query/dataset/UDTFNonAlignDataSet.java | 2 +-
.../org/apache/iotdb/db/utils/datastructure/BinaryTVListTest.java | 2 +-
.../org/apache/iotdb/db/utils/datastructure/BooleanTVListTest.java | 2 +-
.../org/apache/iotdb/db/utils/datastructure/DoubleTVListTest.java | 2 +-
.../org/apache/iotdb/db/utils/datastructure/FloatTVListTest.java | 2 +-
.../java/org/apache/iotdb/db/utils/datastructure/IntTVListTest.java | 2 +-
.../org/apache/iotdb/db/utils/datastructure/LongTVListTest.java | 2 +-
session/pom.xml | 4 ----
11 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9e30952..0a9c0c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,6 @@
<common.cli.version>1.3.1</common.cli.version>
<common.codec.version>1.13</common.codec.version>
<common.collections.version>3.2.2</common.collections.version>
- <common.lang.version>2.6</common.lang.version>
<common.lang3.version>3.8.1</common.lang3.version>
<common.logging.version>1.1.3</common.logging.version>
<org.slf4j.version>1.7.25</org.slf4j.version>
@@ -202,11 +201,6 @@
<version>[${guava.version},)</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${common.lang.version}</version>
- </dependency>
- <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>${common.cli.version}</version>
diff --git a/server/pom.xml b/server/pom.xml
index d1ce0ef..a985d6a 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -80,10 +80,6 @@
<artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
diff --git
a/server/src/main/java/org/apache/iotdb/db/mqtt/BrokerAuthenticator.java
b/server/src/main/java/org/apache/iotdb/db/mqtt/BrokerAuthenticator.java
index 37dbe73..4deabe0 100644
--- a/server/src/main/java/org/apache/iotdb/db/mqtt/BrokerAuthenticator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mqtt/BrokerAuthenticator.java
@@ -22,7 +22,7 @@ import org.apache.iotdb.db.auth.authorizer.BasicAuthorizer;
import org.apache.iotdb.db.auth.authorizer.IAuthorizer;
import io.moquette.broker.security.IAuthenticator;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFNonAlignDataSet.java
b/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFNonAlignDataSet.java
index 3aaf650..db91446 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFNonAlignDataSet.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFNonAlignDataSet.java
@@ -36,7 +36,7 @@ import org.apache.iotdb.tsfile.utils.Pair;
import org.apache.iotdb.tsfile.utils.PublicBAOS;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
import java.io.IOException;
import java.nio.ByteBuffer;
diff --git
a/server/src/test/java/org/apache/iotdb/db/utils/datastructure/BinaryTVListTest.java
b/server/src/test/java/org/apache/iotdb/db/utils/datastructure/BinaryTVListTest.java
index 5268701..b46a2b9 100644
---
a/server/src/test/java/org/apache/iotdb/db/utils/datastructure/BinaryTVListTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/utils/datastructure/BinaryTVListTest.java
@@ -20,7 +20,7 @@ package org.apache.iotdb.db.utils.datastructure;
import org.apache.iotdb.tsfile.utils.Binary;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.junit.Assert;
import org.junit.Test;
diff --git
a/server/src/test/java/org/apache/iotdb/db/utils/datastructure/BooleanTVListTest.java
b/server/src/test/java/org/apache/iotdb/db/utils/datastructure/BooleanTVListTest.java
index 3da88fb..20c2796 100644
---
a/server/src/test/java/org/apache/iotdb/db/utils/datastructure/BooleanTVListTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/utils/datastructure/BooleanTVListTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.db.utils.datastructure;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.junit.Assert;
import org.junit.Test;
diff --git
a/server/src/test/java/org/apache/iotdb/db/utils/datastructure/DoubleTVListTest.java
b/server/src/test/java/org/apache/iotdb/db/utils/datastructure/DoubleTVListTest.java
index 66176ef..47d5a9d 100644
---
a/server/src/test/java/org/apache/iotdb/db/utils/datastructure/DoubleTVListTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/utils/datastructure/DoubleTVListTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.db.utils.datastructure;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.junit.Assert;
import org.junit.Test;
diff --git
a/server/src/test/java/org/apache/iotdb/db/utils/datastructure/FloatTVListTest.java
b/server/src/test/java/org/apache/iotdb/db/utils/datastructure/FloatTVListTest.java
index 53d4431..a132f7a 100644
---
a/server/src/test/java/org/apache/iotdb/db/utils/datastructure/FloatTVListTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/utils/datastructure/FloatTVListTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.db.utils.datastructure;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.junit.Assert;
import org.junit.Test;
diff --git
a/server/src/test/java/org/apache/iotdb/db/utils/datastructure/IntTVListTest.java
b/server/src/test/java/org/apache/iotdb/db/utils/datastructure/IntTVListTest.java
index d00f68a..250ad5c 100644
---
a/server/src/test/java/org/apache/iotdb/db/utils/datastructure/IntTVListTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/utils/datastructure/IntTVListTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.db.utils.datastructure;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.junit.Assert;
import org.junit.Test;
diff --git
a/server/src/test/java/org/apache/iotdb/db/utils/datastructure/LongTVListTest.java
b/server/src/test/java/org/apache/iotdb/db/utils/datastructure/LongTVListTest.java
index d0f9526..fc63ec3 100644
---
a/server/src/test/java/org/apache/iotdb/db/utils/datastructure/LongTVListTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/utils/datastructure/LongTVListTest.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.utils.datastructure;
import org.apache.iotdb.tsfile.read.TimeValuePair;
import org.apache.iotdb.tsfile.utils.TsPrimitiveType.TsLong;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.junit.Assert;
import org.junit.Test;
diff --git a/session/pom.xml b/session/pom.xml
index 4c68333..3e3bb71 100644
--- a/session/pom.xml
+++ b/session/pom.xml
@@ -95,10 +95,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
</dependencies>
<profiles>
<profile>
