This is an automated email from the ASF dual-hosted git repository.
corgy pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new 6e5737c1ec [Improve][Core] Update apache common to apache common lang3
(#9694)
6e5737c1ec is described below
commit 6e5737c1ec6c084af415b7ab7c456a98626dca8c
Author: litiliu <[email protected]>
AuthorDate: Fri Aug 15 18:16:06 2025 +0800
[Improve][Core] Update apache common to apache common lang3 (#9694)
Co-authored-by: litiliu <[email protected]>
---
.../apache/seatunnel/api/ImportClassCheckTest.java | 26 ++++++++++++++++++++++
.../catalog/oceanbase/OceanBaseMySqlCatalog.java | 2 +-
.../seatunnel/kudu/catalog/KuduCatalog.java | 2 +-
.../connectors/seatunnel/kudu/util/KuduUtil.java | 2 +-
.../seatunnel/paimon/utils/SchemaUtil.java | 2 +-
5 files changed, 30 insertions(+), 4 deletions(-)
diff --git
a/seatunnel-ci-tools/src/test/java/org/apache/seatunnel/api/ImportClassCheckTest.java
b/seatunnel-ci-tools/src/test/java/org/apache/seatunnel/api/ImportClassCheckTest.java
index 3bd5b1ed62..677798500d 100644
---
a/seatunnel-ci-tools/src/test/java/org/apache/seatunnel/api/ImportClassCheckTest.java
+++
b/seatunnel-ci-tools/src/test/java/org/apache/seatunnel/api/ImportClassCheckTest.java
@@ -83,6 +83,32 @@ public class ImportClassCheckTest {
}
}
+ @Test
+ public void commonLang2Check() {
+ // both common-lang and comon-lang3 share the same prefix
org.apache.commons.lang
+ Map<String, List<String>> commonLangMap =
+ checkImportClassPrefix(
+ Arrays.asList("org.apache.commons.lang"),
+ Collections.emptyList(),
+ Collections.emptyList());
+ // common-lang3
+ Map<String, List<String>> commonLang3Map =
+ checkImportClassPrefix(
+ Arrays.asList("org.apache.commons.lang3"),
+ Collections.emptyList(),
+ Collections.emptyList());
+
+ // find the one in common-lang but not common-lang3
+ Map<String, List<String>> errorMap =
+ commonLangMap.entrySet().stream()
+ .filter(entry ->
!commonLang3Map.containsKey(entry.getKey()))
+ .collect(Collectors.toMap(Map.Entry::getKey,
Map.Entry::getValue));
+
+ Assertions.assertEquals(
+ 0, errorMap.size(), shadeErrorMsg("org.apache.commons.lang",
errorMap));
+ log.info("check org.apache.commons.lang successfully");
+ }
+
@Test
public void guavaShadeCheck() {
Map<String, List<String>> errorMap =
diff --git
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseMySqlCatalog.java
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseMySqlCatalog.java
index 3fd7735907..7098c3d7bc 100644
---
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseMySqlCatalog.java
+++
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseMySqlCatalog.java
@@ -33,7 +33,7 @@ import
org.apache.seatunnel.connectors.seatunnel.jdbc.catalog.AbstractJdbcCatalo
import
org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.oceanbase.OceanBaseMySqlTypeConverter;
import
org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.oceanbase.OceanBaseMysqlType;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import lombok.extern.slf4j.Slf4j;
diff --git
a/seatunnel-connectors-v2/connector-kudu/src/main/java/org/apache/seatunnel/connectors/seatunnel/kudu/catalog/KuduCatalog.java
b/seatunnel-connectors-v2/connector-kudu/src/main/java/org/apache/seatunnel/connectors/seatunnel/kudu/catalog/KuduCatalog.java
index bc3b97be77..d72aeec238 100644
---
a/seatunnel-connectors-v2/connector-kudu/src/main/java/org/apache/seatunnel/connectors/seatunnel/kudu/catalog/KuduCatalog.java
+++
b/seatunnel-connectors-v2/connector-kudu/src/main/java/org/apache/seatunnel/connectors/seatunnel/kudu/catalog/KuduCatalog.java
@@ -35,7 +35,7 @@ import
org.apache.seatunnel.connectors.seatunnel.kudu.config.KuduBaseOptions;
import
org.apache.seatunnel.connectors.seatunnel.kudu.kuduclient.KuduTypeMapper;
import org.apache.seatunnel.connectors.seatunnel.kudu.util.KuduUtil;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.kudu.ColumnSchema;
import org.apache.kudu.Schema;
import org.apache.kudu.client.KuduClient;
diff --git
a/seatunnel-connectors-v2/connector-kudu/src/main/java/org/apache/seatunnel/connectors/seatunnel/kudu/util/KuduUtil.java
b/seatunnel-connectors-v2/connector-kudu/src/main/java/org/apache/seatunnel/connectors/seatunnel/kudu/util/KuduUtil.java
index e6ff36b9af..f97b05064a 100644
---
a/seatunnel-connectors-v2/connector-kudu/src/main/java/org/apache/seatunnel/connectors/seatunnel/kudu/util/KuduUtil.java
+++
b/seatunnel-connectors-v2/connector-kudu/src/main/java/org/apache/seatunnel/connectors/seatunnel/kudu/util/KuduUtil.java
@@ -24,7 +24,7 @@ import
org.apache.seatunnel.connectors.seatunnel.kudu.config.KuduSourceTableConf
import
org.apache.seatunnel.connectors.seatunnel.kudu.exception.KuduConnectorErrorCode;
import
org.apache.seatunnel.connectors.seatunnel.kudu.exception.KuduConnectorException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.authentication.util.KerberosName;
diff --git
a/seatunnel-connectors-v2/connector-paimon/src/main/java/org/apache/seatunnel/connectors/seatunnel/paimon/utils/SchemaUtil.java
b/seatunnel-connectors-v2/connector-paimon/src/main/java/org/apache/seatunnel/connectors/seatunnel/paimon/utils/SchemaUtil.java
index 7638990c98..23966fcc34 100644
---
a/seatunnel-connectors-v2/connector-paimon/src/main/java/org/apache/seatunnel/connectors/seatunnel/paimon/utils/SchemaUtil.java
+++
b/seatunnel-connectors-v2/connector-paimon/src/main/java/org/apache/seatunnel/connectors/seatunnel/paimon/utils/SchemaUtil.java
@@ -26,10 +26,10 @@ import
org.apache.seatunnel.connectors.seatunnel.paimon.data.PaimonTypeMapper;
import
org.apache.seatunnel.connectors.seatunnel.paimon.exception.PaimonConnectorErrorCode;
import
org.apache.seatunnel.connectors.seatunnel.paimon.exception.PaimonConnectorException;
+import org.apache.commons.lang3.StringUtils;
import org.apache.paimon.CoreOptions;
import org.apache.paimon.schema.Schema;
import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.paimon.shade.org.apache.commons.lang.StringUtils;
import org.apache.paimon.types.DataField;
import org.apache.paimon.types.DataType;
import org.apache.paimon.types.DataTypeJsonParser;
