This is an automated email from the ASF dual-hosted git repository.
jianbin pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push:
new e240db83c3 optimize: Upgrade/commons lang 2.6 to 3.18 (#7716)
e240db83c3 is described below
commit e240db83c3fe18d2dcd473ead672bd959d49e750
Author: yougecn <[email protected]>
AuthorDate: Tue Oct 21 17:45:24 2025 +0800
optimize: Upgrade/commons lang 2.6 to 3.18 (#7716)
---
all/pom.xml | 4 ++--
changes/en-us/2.x.md | 4 +++-
changes/zh-cn/2.x.md | 2 ++
common/pom.xml | 4 ++--
.../org/apache/seata/common/exception/ResourceBundleUtil.java | 2 +-
.../org/apache/seata/common/loader/EnhancedServiceLoader.java | 6 +++---
.../seata/common/loader/EnhancedServiceNotFoundException.java | 4 +---
.../src/main/java/org/apache/seata/config/FileConfiguration.java | 2 +-
.../java/org/apache/seata/core/protocol/RegisterTMRequest.java | 2 +-
core/src/main/java/org/apache/seata/core/protocol/Version.java | 2 +-
.../apache/seata/core/rpc/DefaultServerMessageListenerImpl.java | 2 +-
.../java/org/apache/seata/core/rpc/netty/NettyBaseConfig.java | 2 +-
.../org/apache/seata/core/rpc/netty/TmNettyRemotingClient.java | 2 +-
.../java/org/apache/seata/core/rpc/netty/grpc/GrpcDecoder.java | 2 +-
.../apache/seata/core/rpc/processor/server/RegRmProcessor.java | 2 +-
.../apache/seata/core/rpc/processor/server/RegTmProcessor.java | 2 +-
dependencies/pom.xml | 8 ++++----
.../seata/discovery/registry/sofa/SofaRegistryServiceImpl.java | 2 +-
.../seata/integration/tx/api/fence/config/CommonFenceConfig.java | 2 +-
.../tx/api/fence/store/db/CommonFenceStoreDataBaseDAO.java | 2 +-
.../org/apache/seata/integration/http/DefaultHttpExecutor.java | 2 +-
.../main/java/org/apache/seata/rm/datasource/DataSourceProxy.java | 2 +-
.../rm/datasource/exec/postgresql/PostgresqlInsertExecutor.java | 8 ++++----
.../seata/rm/datasource/undo/mysql/MySQLUndoLogManager.java | 2 +-
.../autoconfigure/provider/SpringBootConfigurationProvider.java | 2 +-
.../org/apache/seata/server/coordinator/DefaultCoordinator.java | 2 +-
.../apache/seata/server/storage/db/store/LogStoreDataBaseDAO.java | 4 ++--
.../org/apache/seata/server/session/FileSessionManagerTest.java | 2 +-
.../apache/seata/spring/annotation/GlobalTransactionScanner.java | 2 +-
.../spring/annotation/scannercheckers/PackageScannerChecker.java | 4 ++--
.../annotation/scannercheckers/ScopeBeansScannerChecker.java | 4 ++--
.../main/java/org/apache/seata/sqlparser/struct/IndexMeta.java | 2 +-
32 files changed, 48 insertions(+), 46 deletions(-)
diff --git a/all/pom.xml b/all/pom.xml
index 1622a39886..fefcbc8b4a 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -416,8 +416,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index a6c050aa15..22c90f66bc 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -71,9 +71,9 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#7632](https://github.com/apache/incubator-seata/pull/7632)] upgrade
sha.js to version 2.4.12
- [[#7633](https://github.com/apache/incubator-seata/pull/7633)] Upgrade
cipher-base to version 1.0.6
+- [[#7716](https://github.com/apache/incubator-seata/pull/7716)] Update
commons-lang to 3.18.0
- [[#7699](https://github.com/apache/incubator-seata/pull/7699)] Upgrade axios
to version 1.12.2
-
### test:
- [[#7541](https://github.com/seata/seata/pull/7541)] fix jakarta UT failed in
jdk17+
@@ -120,6 +120,7 @@ Thanks to these contributors for their code commits. Please
report an unintended
- [unifolio0](https://github.com/unifolio0)
- [Asuka-star](https://github.com/Asuka-star)
- [YoWuwuuuw](https://github.com/YoWuwuuuw)
+- [yougecn](https://github.com/yougecn)
- [jongmin-chung](https://github.com/jongmin-chung)
- [jihun4452](https://github.com/jihun4452)
- [psxjoy](https://github.com/psxjoy)
@@ -127,4 +128,5 @@ Thanks to these contributors for their code commits. Please
report an unintended
- [LegendPei](https://github.com/LegendPei)
- [lokidundun](https://github.com/lokidundun)
+
Also, we receive many valuable issues, questions and advices from our
community. Thanks for you all.
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index d802d79203..8885012973 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -70,6 +70,7 @@
- [[#7632](https://github.com/apache/incubator-seata/pull/7632)]
升级sha.js为2.4.12
- [[#7633](https://github.com/apache/incubator-seata/pull/7633)]
升级cipher-base为1.0.6
+- [[#7716](https://github.com/apache/incubator-seata/pull/7716)] 升级
commons-lang 为 3.18.0
- [[#7699](https://github.com/apache/incubator-seata/pull/7699)] 升级axios到1.12.2
### test:
@@ -117,6 +118,7 @@
- [unifolio0](https://github.com/unifolio0)
- [Asuka-star](https://github.com/Asuka-star)
- [YoWuwuuuw](https://github.com/YoWuwuuuw)
+- [yougecn](https://github.com/yougecn)
- [jongmin-chung](https://github.com/jongmin-chung)
- [jihun4452](https://github.com/jihun4452)
- [psxjoy](https://github.com/psxjoy)
diff --git a/common/pom.xml b/common/pom.xml
index 0db3696a5d..2d2d047e8e 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -40,8 +40,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
diff --git
a/common/src/main/java/org/apache/seata/common/exception/ResourceBundleUtil.java
b/common/src/main/java/org/apache/seata/common/exception/ResourceBundleUtil.java
index 3ff38df60a..7cfe75ff29 100644
---
a/common/src/main/java/org/apache/seata/common/exception/ResourceBundleUtil.java
+++
b/common/src/main/java/org/apache/seata/common/exception/ResourceBundleUtil.java
@@ -16,7 +16,7 @@
*/
package org.apache.seata.common.exception;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.seata.common.loader.EnhancedServiceLoader;
import java.text.MessageFormat;
diff --git
a/common/src/main/java/org/apache/seata/common/loader/EnhancedServiceLoader.java
b/common/src/main/java/org/apache/seata/common/loader/EnhancedServiceLoader.java
index ab9d710447..9472da7518 100644
---
a/common/src/main/java/org/apache/seata/common/loader/EnhancedServiceLoader.java
+++
b/common/src/main/java/org/apache/seata/common/loader/EnhancedServiceLoader.java
@@ -16,7 +16,7 @@
*/
package org.apache.seata.common.loader;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.seata.common.Constants;
import org.apache.seata.common.executor.Initialize;
import org.apache.seata.common.util.CollectionUtils;
@@ -436,7 +436,7 @@ public class EnhancedServiceLoader {
throw e;
} catch (Throwable e) {
throw new EnhancedServiceNotFoundException("not found service
provider for : " + type.getName()
- + " caused by " + ExceptionUtils.getFullStackTrace(e));
+ + " caused by " + ExceptionUtils.getStackTrace(e));
}
}
@@ -456,7 +456,7 @@ public class EnhancedServiceLoader {
throw (EnhancedServiceNotFoundException) e;
} else {
throw new EnhancedServiceNotFoundException("not found
service provider for : " + type.getName()
- + " caused by " +
ExceptionUtils.getFullStackTrace(e));
+ + " caused by " + ExceptionUtils.getStackTrace(e));
}
}
}
diff --git
a/common/src/main/java/org/apache/seata/common/loader/EnhancedServiceNotFoundException.java
b/common/src/main/java/org/apache/seata/common/loader/EnhancedServiceNotFoundException.java
index 88bc211d5d..22c4aa3313 100644
---
a/common/src/main/java/org/apache/seata/common/loader/EnhancedServiceNotFoundException.java
+++
b/common/src/main/java/org/apache/seata/common/loader/EnhancedServiceNotFoundException.java
@@ -16,13 +16,11 @@
*/
package org.apache.seata.common.loader;
-import org.apache.commons.lang.exception.NestableRuntimeException;
-
/**
* The type Enhanced service not found exception.
*
*/
-public class EnhancedServiceNotFoundException extends NestableRuntimeException
{
+public class EnhancedServiceNotFoundException extends RuntimeException {
private static final long serialVersionUID = 7748438218914409019L;
/**
diff --git
a/config/seata-config-core/src/main/java/org/apache/seata/config/FileConfiguration.java
b/config/seata-config-core/src/main/java/org/apache/seata/config/FileConfiguration.java
index 5500b5fbaa..31e714bb66 100644
---
a/config/seata-config-core/src/main/java/org/apache/seata/config/FileConfiguration.java
+++
b/config/seata-config-core/src/main/java/org/apache/seata/config/FileConfiguration.java
@@ -16,7 +16,7 @@
*/
package org.apache.seata.config;
-import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.seata.common.thread.NamedThreadFactory;
import org.apache.seata.common.util.CollectionUtils;
import org.apache.seata.common.util.StringUtils;
diff --git
a/core/src/main/java/org/apache/seata/core/protocol/RegisterTMRequest.java
b/core/src/main/java/org/apache/seata/core/protocol/RegisterTMRequest.java
index dc668c4eae..c371f97484 100644
--- a/core/src/main/java/org/apache/seata/core/protocol/RegisterTMRequest.java
+++ b/core/src/main/java/org/apache/seata/core/protocol/RegisterTMRequest.java
@@ -16,7 +16,7 @@
*/
package org.apache.seata.core.protocol;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.seata.common.ConfigurationKeys;
import org.apache.seata.common.util.NetUtil;
diff --git a/core/src/main/java/org/apache/seata/core/protocol/Version.java
b/core/src/main/java/org/apache/seata/core/protocol/Version.java
index 58676d8486..3c7e77376c 100644
--- a/core/src/main/java/org/apache/seata/core/protocol/Version.java
+++ b/core/src/main/java/org/apache/seata/core/protocol/Version.java
@@ -17,7 +17,7 @@
package org.apache.seata.core.protocol;
import io.netty.channel.Channel;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.seata.common.util.NetUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/core/src/main/java/org/apache/seata/core/rpc/DefaultServerMessageListenerImpl.java
b/core/src/main/java/org/apache/seata/core/rpc/DefaultServerMessageListenerImpl.java
index 222dff6fb5..e24626fd05 100644
---
a/core/src/main/java/org/apache/seata/core/rpc/DefaultServerMessageListenerImpl.java
+++
b/core/src/main/java/org/apache/seata/core/rpc/DefaultServerMessageListenerImpl.java
@@ -17,7 +17,7 @@
package org.apache.seata.core.rpc;
import io.netty.channel.ChannelHandlerContext;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.seata.common.thread.NamedThreadFactory;
import org.apache.seata.common.util.NetUtil;
import org.apache.seata.core.protocol.AbstractMessage;
diff --git
a/core/src/main/java/org/apache/seata/core/rpc/netty/NettyBaseConfig.java
b/core/src/main/java/org/apache/seata/core/rpc/netty/NettyBaseConfig.java
index 355b5830f6..e96af88f2e 100644
--- a/core/src/main/java/org/apache/seata/core/rpc/netty/NettyBaseConfig.java
+++ b/core/src/main/java/org/apache/seata/core/rpc/netty/NettyBaseConfig.java
@@ -25,7 +25,7 @@ import io.netty.channel.socket.nio.NioServerSocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.util.NettyRuntime;
import io.netty.util.internal.PlatformDependent;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.seata.config.Configuration;
import org.apache.seata.config.ConfigurationFactory;
import org.apache.seata.core.constants.ConfigurationKeys;
diff --git
a/core/src/main/java/org/apache/seata/core/rpc/netty/TmNettyRemotingClient.java
b/core/src/main/java/org/apache/seata/core/rpc/netty/TmNettyRemotingClient.java
index 440dc630f9..ee6ab01955 100644
---
a/core/src/main/java/org/apache/seata/core/rpc/netty/TmNettyRemotingClient.java
+++
b/core/src/main/java/org/apache/seata/core/rpc/netty/TmNettyRemotingClient.java
@@ -17,7 +17,7 @@
package org.apache.seata.core.rpc.netty;
import io.netty.channel.Channel;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.seata.common.DefaultValues;
import org.apache.seata.common.exception.FrameworkException;
import org.apache.seata.common.loader.EnhancedServiceLoader;
diff --git
a/core/src/main/java/org/apache/seata/core/rpc/netty/grpc/GrpcDecoder.java
b/core/src/main/java/org/apache/seata/core/rpc/netty/grpc/GrpcDecoder.java
index 9253a3785f..c76f5ae3a8 100644
--- a/core/src/main/java/org/apache/seata/core/rpc/netty/grpc/GrpcDecoder.java
+++ b/core/src/main/java/org/apache/seata/core/rpc/netty/grpc/GrpcDecoder.java
@@ -23,7 +23,7 @@ import io.netty.handler.codec.http2.Http2DataFrame;
import io.netty.handler.codec.http2.Http2HeadersFrame;
import io.netty.util.ReferenceCountUtil;
import io.netty.util.ReferenceCounted;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.seata.core.compressor.Compressor;
import org.apache.seata.core.compressor.CompressorFactory;
import org.apache.seata.core.protocol.HeartbeatMessage;
diff --git
a/core/src/main/java/org/apache/seata/core/rpc/processor/server/RegRmProcessor.java
b/core/src/main/java/org/apache/seata/core/rpc/processor/server/RegRmProcessor.java
index c72733906e..10a89ae9c2 100644
---
a/core/src/main/java/org/apache/seata/core/rpc/processor/server/RegRmProcessor.java
+++
b/core/src/main/java/org/apache/seata/core/rpc/processor/server/RegRmProcessor.java
@@ -17,7 +17,7 @@
package org.apache.seata.core.rpc.processor.server;
import io.netty.channel.ChannelHandlerContext;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.seata.common.loader.EnhancedServiceLoader;
import org.apache.seata.common.util.NetUtil;
import org.apache.seata.core.protocol.RegisterRMRequest;
diff --git
a/core/src/main/java/org/apache/seata/core/rpc/processor/server/RegTmProcessor.java
b/core/src/main/java/org/apache/seata/core/rpc/processor/server/RegTmProcessor.java
index 909d722351..2cc5d4ed57 100644
---
a/core/src/main/java/org/apache/seata/core/rpc/processor/server/RegTmProcessor.java
+++
b/core/src/main/java/org/apache/seata/core/rpc/processor/server/RegTmProcessor.java
@@ -17,7 +17,7 @@
package org.apache.seata.core.rpc.processor.server;
import io.netty.channel.ChannelHandlerContext;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.seata.common.loader.EnhancedServiceLoader;
import org.apache.seata.common.util.NetUtil;
import org.apache.seata.core.protocol.RegisterTMRequest;
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 8a0d55ae71..78d720fe43 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -46,7 +46,7 @@
<protostuff.version>1.5.9</protostuff.version>
<config.version>1.2.1</config.version>
<commons-logging.version>1.2</commons-logging.version>
- <commons-lang.version>2.6</commons-lang.version>
+ <commons-lang3.version>3.18.0</commons-lang3.version>
<commons-io.version>2.8.0</commons-io.version>
<aopalliance.version>1.0</aopalliance.version>
<zkclient.version>0.11</zkclient.version>
@@ -325,9 +325,9 @@
<version>${commons-logging.version}</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons-lang3.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
diff --git
a/discovery/seata-discovery-sofa/src/main/java/org/apache/seata/discovery/registry/sofa/SofaRegistryServiceImpl.java
b/discovery/seata-discovery-sofa/src/main/java/org/apache/seata/discovery/registry/sofa/SofaRegistryServiceImpl.java
index 0d25de7307..f9cce9b353 100644
---
a/discovery/seata-discovery-sofa/src/main/java/org/apache/seata/discovery/registry/sofa/SofaRegistryServiceImpl.java
+++
b/discovery/seata-discovery-sofa/src/main/java/org/apache/seata/discovery/registry/sofa/SofaRegistryServiceImpl.java
@@ -25,7 +25,7 @@ import
com.alipay.sofa.registry.client.api.registration.SubscriberRegistration;
import com.alipay.sofa.registry.client.provider.DefaultRegistryClient;
import
com.alipay.sofa.registry.client.provider.DefaultRegistryClientConfigBuilder;
import com.alipay.sofa.registry.core.model.ScopeEnum;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.seata.common.util.NetUtil;
import org.apache.seata.config.Configuration;
import org.apache.seata.config.ConfigurationFactory;
diff --git
a/integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/fence/config/CommonFenceConfig.java
b/integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/fence/config/CommonFenceConfig.java
index 21e407e77f..068a6110f1 100644
---
a/integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/fence/config/CommonFenceConfig.java
+++
b/integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/fence/config/CommonFenceConfig.java
@@ -16,7 +16,7 @@
*/
package org.apache.seata.integration.tx.api.fence.config;
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.time.DateUtils;
import org.apache.seata.common.DefaultValues;
import org.apache.seata.common.thread.NamedThreadFactory;
import org.apache.seata.core.rpc.Disposable;
diff --git
a/integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/fence/store/db/CommonFenceStoreDataBaseDAO.java
b/integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/fence/store/db/CommonFenceStoreDataBaseDAO.java
index 4dcff8a8d0..8a9b9fc07e 100644
---
a/integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/fence/store/db/CommonFenceStoreDataBaseDAO.java
+++
b/integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/fence/store/db/CommonFenceStoreDataBaseDAO.java
@@ -183,7 +183,7 @@ public class CommonFenceStoreDataBaseDAO implements
CommonFenceStore {
public int deleteTCCFenceDO(Connection conn, List<String> xids) {
PreparedStatement ps = null;
try {
- String paramsPlaceHolder =
org.apache.commons.lang.StringUtils.repeat("?", ",", xids.size());
+ String paramsPlaceHolder =
org.apache.commons.lang3.StringUtils.repeat("?", ",", xids.size());
String sql = CommonFenceStoreSqls.getDeleteSQLByXids(logTableName,
paramsPlaceHolder);
ps = conn.prepareStatement(sql);
for (int i = 0; i < xids.size(); i++) {
diff --git
a/integration/http/src/main/java/org/apache/seata/integration/http/DefaultHttpExecutor.java
b/integration/http/src/main/java/org/apache/seata/integration/http/DefaultHttpExecutor.java
index 702dc88ec9..e163ebe526 100644
---
a/integration/http/src/main/java/org/apache/seata/integration/http/DefaultHttpExecutor.java
+++
b/integration/http/src/main/java/org/apache/seata/integration/http/DefaultHttpExecutor.java
@@ -16,7 +16,7 @@
*/
package org.apache.seata.integration.http;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpResponse;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
diff --git
a/rm-datasource/src/main/java/org/apache/seata/rm/datasource/DataSourceProxy.java
b/rm-datasource/src/main/java/org/apache/seata/rm/datasource/DataSourceProxy.java
index fef0d212c3..05df4c1110 100644
---
a/rm-datasource/src/main/java/org/apache/seata/rm/datasource/DataSourceProxy.java
+++
b/rm-datasource/src/main/java/org/apache/seata/rm/datasource/DataSourceProxy.java
@@ -16,7 +16,7 @@
*/
package org.apache.seata.rm.datasource;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.seata.common.ConfigurationKeys;
import org.apache.seata.common.loader.EnhancedServiceNotFoundException;
import org.apache.seata.config.ConfigurationFactory;
diff --git
a/rm-datasource/src/main/java/org/apache/seata/rm/datasource/exec/postgresql/PostgresqlInsertExecutor.java
b/rm-datasource/src/main/java/org/apache/seata/rm/datasource/exec/postgresql/PostgresqlInsertExecutor.java
index e56165ef66..19373139ed 100644
---
a/rm-datasource/src/main/java/org/apache/seata/rm/datasource/exec/postgresql/PostgresqlInsertExecutor.java
+++
b/rm-datasource/src/main/java/org/apache/seata/rm/datasource/exec/postgresql/PostgresqlInsertExecutor.java
@@ -152,8 +152,8 @@ public class PostgresqlInsertExecutor extends
BaseInsertExecutor implements Sequ
ColumnMeta pkMeta = pkMetaMap.values().iterator().next();
String columnDef = pkMeta.getColumnDef();
// sample: nextval('test_id_seq'::regclass)
- String seq =
org.apache.commons.lang.StringUtils.substringBetween(columnDef, "'", "'");
- String function =
org.apache.commons.lang.StringUtils.substringBetween(columnDef, "", "(");
+ String seq =
org.apache.commons.lang3.StringUtils.substringBetween(columnDef, "'", "'");
+ String function =
org.apache.commons.lang3.StringUtils.substringBetween(columnDef, "", "(");
if (StringUtils.isBlank(seq)) {
throw new ShouldNeverHappenException("get primary key value
failed, cause columnDef is " + columnDef);
}
@@ -174,8 +174,8 @@ public class PostgresqlInsertExecutor extends
BaseInsertExecutor implements Sequ
ColumnMeta pkMeta = pkMetaMap.values().iterator().next();
String columnDef = pkMeta.getColumnDef();
// sample: nextval('test_id_seq'::regclass)
- String seq =
org.apache.commons.lang.StringUtils.substringBetween(columnDef, "'", "'");
- String function =
org.apache.commons.lang.StringUtils.substringBetween(columnDef, "", "(");
+ String seq =
org.apache.commons.lang3.StringUtils.substringBetween(columnDef, "'", "'");
+ String function =
org.apache.commons.lang3.StringUtils.substringBetween(columnDef, "", "(");
if (StringUtils.isBlank(seq)) {
throw new ShouldNeverHappenException("get primary key value
failed, cause columnDef is " + columnDef);
}
diff --git
a/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/mysql/MySQLUndoLogManager.java
b/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/mysql/MySQLUndoLogManager.java
index f691b07013..12960beec4 100644
---
a/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/mysql/MySQLUndoLogManager.java
+++
b/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/mysql/MySQLUndoLogManager.java
@@ -16,7 +16,7 @@
*/
package org.apache.seata.rm.datasource.undo.mysql;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.seata.common.loader.LoadLevel;
import org.apache.seata.common.util.CollectionUtils;
import org.apache.seata.common.util.IOUtil;
diff --git
a/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/java/org/apache/seata/spring/boot/autoconfigure/provider/SpringBootConfigurationProvider.java
b/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/java/org/apache/seata/spring/boot/autoconfigure/provider/SpringBootConfigurationProvider.java
index d403579d7c..fc1159364d 100644
---
a/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/java/org/apache/seata/spring/boot/autoconfigure/provider/SpringBootConfigurationProvider.java
+++
b/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/java/org/apache/seata/spring/boot/autoconfigure/provider/SpringBootConfigurationProvider.java
@@ -16,7 +16,7 @@
*/
package org.apache.seata.spring.boot.autoconfigure.provider;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.seata.common.exception.ShouldNeverHappenException;
import org.apache.seata.common.holder.ObjectHolder;
import org.apache.seata.common.util.CollectionUtils;
diff --git
a/server/src/main/java/org/apache/seata/server/coordinator/DefaultCoordinator.java
b/server/src/main/java/org/apache/seata/server/coordinator/DefaultCoordinator.java
index 556d5135fd..4923f3d051 100644
---
a/server/src/main/java/org/apache/seata/server/coordinator/DefaultCoordinator.java
+++
b/server/src/main/java/org/apache/seata/server/coordinator/DefaultCoordinator.java
@@ -17,7 +17,7 @@
package org.apache.seata.server.coordinator;
import io.netty.channel.Channel;
-import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.seata.common.DefaultValues;
import org.apache.seata.common.store.SessionMode;
import org.apache.seata.common.thread.NamedThreadFactory;
diff --git
a/server/src/main/java/org/apache/seata/server/storage/db/store/LogStoreDataBaseDAO.java
b/server/src/main/java/org/apache/seata/server/storage/db/store/LogStoreDataBaseDAO.java
index 33e1c86239..a842970271 100644
---
a/server/src/main/java/org/apache/seata/server/storage/db/store/LogStoreDataBaseDAO.java
+++
b/server/src/main/java/org/apache/seata/server/storage/db/store/LogStoreDataBaseDAO.java
@@ -163,7 +163,7 @@ public class LogStoreDataBaseDAO implements LogStore {
conn = logStoreDataSource.getConnection();
conn.setAutoCommit(true);
- String paramsPlaceHolder =
org.apache.commons.lang.StringUtils.repeat("?", ",", statuses.length);
+ String paramsPlaceHolder =
org.apache.commons.lang3.StringUtils.repeat("?", ",", statuses.length);
String sql = LogStoreSqlsFactory.getLogStoreSqls(dbType)
.getQueryGlobalTransactionSQLByStatus(globalTable,
paramsPlaceHolder);
@@ -312,7 +312,7 @@ public class LogStoreDataBaseDAO implements LogStore {
public List<BranchTransactionDO> queryBranchTransactionDO(List<String>
xids) {
int length = xids.size();
List<BranchTransactionDO> rets = new ArrayList<>(length * 3);
- String paramsPlaceHolder =
org.apache.commons.lang.StringUtils.repeat("?", ",", length);
+ String paramsPlaceHolder =
org.apache.commons.lang3.StringUtils.repeat("?", ",", length);
String sql =
LogStoreSqlsFactory.getLogStoreSqls(dbType).getQueryBranchTransaction(branchTable,
paramsPlaceHolder);
Connection conn = null;
diff --git
a/server/src/test/java/org/apache/seata/server/session/FileSessionManagerTest.java
b/server/src/test/java/org/apache/seata/server/session/FileSessionManagerTest.java
index b55dabe615..f4c22f7b44 100644
---
a/server/src/test/java/org/apache/seata/server/session/FileSessionManagerTest.java
+++
b/server/src/test/java/org/apache/seata/server/session/FileSessionManagerTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.seata.server.session;
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.time.DateUtils;
import org.apache.seata.common.XID;
import org.apache.seata.common.loader.EnhancedServiceLoader;
import org.apache.seata.common.result.PageResult;
diff --git
a/spring/src/main/java/org/apache/seata/spring/annotation/GlobalTransactionScanner.java
b/spring/src/main/java/org/apache/seata/spring/annotation/GlobalTransactionScanner.java
index f763126f84..6b907e82fd 100644
---
a/spring/src/main/java/org/apache/seata/spring/annotation/GlobalTransactionScanner.java
+++
b/spring/src/main/java/org/apache/seata/spring/annotation/GlobalTransactionScanner.java
@@ -19,7 +19,7 @@ package org.apache.seata.spring.annotation;
import com.google.common.collect.ImmutableSet;
import org.aopalliance.aop.Advice;
import org.aopalliance.intercept.MethodInterceptor;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.seata.common.util.CollectionUtils;
import org.apache.seata.common.util.StringUtils;
import org.apache.seata.config.CachedConfigurationChangeListener;
diff --git
a/spring/src/main/java/org/apache/seata/spring/annotation/scannercheckers/PackageScannerChecker.java
b/spring/src/main/java/org/apache/seata/spring/annotation/scannercheckers/PackageScannerChecker.java
index 047edd38f4..5a99662712 100644
---
a/spring/src/main/java/org/apache/seata/spring/annotation/scannercheckers/PackageScannerChecker.java
+++
b/spring/src/main/java/org/apache/seata/spring/annotation/scannercheckers/PackageScannerChecker.java
@@ -16,8 +16,8 @@
*/
package org.apache.seata.spring.annotation.scannercheckers;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.seata.common.loader.LoadLevel;
import org.apache.seata.spring.annotation.ScannerChecker;
import
org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
diff --git
a/spring/src/main/java/org/apache/seata/spring/annotation/scannercheckers/ScopeBeansScannerChecker.java
b/spring/src/main/java/org/apache/seata/spring/annotation/scannercheckers/ScopeBeansScannerChecker.java
index 98bb6b6b76..3c8df37053 100644
---
a/spring/src/main/java/org/apache/seata/spring/annotation/scannercheckers/ScopeBeansScannerChecker.java
+++
b/spring/src/main/java/org/apache/seata/spring/annotation/scannercheckers/ScopeBeansScannerChecker.java
@@ -16,8 +16,8 @@
*/
package org.apache.seata.spring.annotation.scannercheckers;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.seata.common.loader.LoadLevel;
import org.apache.seata.spring.annotation.GlobalLock;
import org.apache.seata.spring.annotation.GlobalTransactionScanner;
diff --git
a/sqlparser/seata-sqlparser-core/src/main/java/org/apache/seata/sqlparser/struct/IndexMeta.java
b/sqlparser/seata-sqlparser-core/src/main/java/org/apache/seata/sqlparser/struct/IndexMeta.java
index 9401d02372..eb0321bd59 100644
---
a/sqlparser/seata-sqlparser-core/src/main/java/org/apache/seata/sqlparser/struct/IndexMeta.java
+++
b/sqlparser/seata-sqlparser-core/src/main/java/org/apache/seata/sqlparser/struct/IndexMeta.java
@@ -16,7 +16,7 @@
*/
package org.apache.seata.sqlparser.struct;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import java.util.ArrayList;
import java.util.List;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
