From 1c3ad34e4447a44220c1f95ae32942f3ae7b3e31 Mon Sep 17 00:00:00 2001 From: libailin Date: Fri, 11 Aug 2023 15:21:35 +0800 Subject: [PATCH] [Feature-#1787]Support hadoop 3 compilation and packaging --- chunjun-connectors/chunjun-connector-binlog/pom.xml | 9 +++++---- .../connector/greenplum/sink/GreenplumSinkFactory.java | 2 +- .../dtstack/chunjun/connector/jdbc/util/JdbcUtil.java | 2 +- .../dtstack/chunjun/connector/s3/config/S3Config.java | 2 +- .../java/com/dtstack/chunjun/config/FieldConfig.java | 2 +- .../com/dtstack/chunjun/element/column/StringColumn.java | 2 +- .../typeutil/serializer/base/StringColumnSerializer.java | 2 +- pom.xml | 2 +- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/chunjun-connectors/chunjun-connector-binlog/pom.xml b/chunjun-connectors/chunjun-connector-binlog/pom.xml index db736ea0ae..ce02caf1e0 100644 --- a/chunjun-connectors/chunjun-connector-binlog/pom.xml +++ b/chunjun-connectors/chunjun-connector-binlog/pom.xml @@ -47,10 +47,11 @@ canal.parse ${canal.version} - - commons-lang - commons-lang - + + + + + logback-classic ch.qos.logback diff --git a/chunjun-connectors/chunjun-connector-greenplum/src/main/java/com/dtstack/chunjun/connector/greenplum/sink/GreenplumSinkFactory.java b/chunjun-connectors/chunjun-connector-greenplum/src/main/java/com/dtstack/chunjun/connector/greenplum/sink/GreenplumSinkFactory.java index 0d04ef7590..6bf3be365c 100644 --- a/chunjun-connectors/chunjun-connector-greenplum/src/main/java/com/dtstack/chunjun/connector/greenplum/sink/GreenplumSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-greenplum/src/main/java/com/dtstack/chunjun/connector/greenplum/sink/GreenplumSinkFactory.java @@ -24,7 +24,7 @@ import com.dtstack.chunjun.connector.jdbc.sink.JdbcSinkFactory; import com.dtstack.chunjun.connector.postgresql.dialect.PostgresqlDialect; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import static com.dtstack.chunjun.connector.greenplum.sink.GreenplumOutputFormat.INSERT_SQL_MODE_TYPE; diff --git a/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/util/JdbcUtil.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/util/JdbcUtil.java index d932084a06..fc46049a96 100644 --- a/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/util/JdbcUtil.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/util/JdbcUtil.java @@ -233,7 +233,7 @@ public static List getTablePrimaryKey(TableIdentify tableIdentify, Conne List indexList = new LinkedList<>(); while (rs.next()) { String index = rs.getString(4); - if (org.apache.commons.lang.StringUtils.isNotBlank(index)) indexList.add(index); + if (StringUtils.isNotBlank(index)) indexList.add(index); } return indexList; } diff --git a/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/config/S3Config.java b/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/config/S3Config.java index 7a45cbfc5a..3c962b4cea 100644 --- a/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/config/S3Config.java +++ b/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/config/S3Config.java @@ -21,9 +21,9 @@ import com.dtstack.chunjun.config.CommonConfig; import com.amazonaws.regions.Regions; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Getter; import lombok.Setter; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; import java.io.Serializable; import java.util.List; diff --git a/chunjun-core/src/main/java/com/dtstack/chunjun/config/FieldConfig.java b/chunjun-core/src/main/java/com/dtstack/chunjun/config/FieldConfig.java index 125dff20a7..7a3a434200 100644 --- a/chunjun-core/src/main/java/com/dtstack/chunjun/config/FieldConfig.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/config/FieldConfig.java @@ -22,7 +22,7 @@ import lombok.Data; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.Serializable; import java.util.ArrayList; diff --git a/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/StringColumn.java b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/StringColumn.java index 15e57e7546..15fbdd2b9c 100644 --- a/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/StringColumn.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/StringColumn.java @@ -25,7 +25,7 @@ import cn.hutool.core.date.LocalDateTimeUtil; import com.alibaba.fastjson.JSON; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import java.math.BigDecimal; diff --git a/chunjun-core/src/main/java/com/dtstack/chunjun/typeutil/serializer/base/StringColumnSerializer.java b/chunjun-core/src/main/java/com/dtstack/chunjun/typeutil/serializer/base/StringColumnSerializer.java index 26b2c069e6..f8dfc27d3c 100644 --- a/chunjun-core/src/main/java/com/dtstack/chunjun/typeutil/serializer/base/StringColumnSerializer.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/typeutil/serializer/base/StringColumnSerializer.java @@ -29,7 +29,7 @@ import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.IOException; diff --git a/pom.xml b/pom.xml index 96a74e5969..8a708d95ce 100755 --- a/pom.xml +++ b/pom.xml @@ -121,7 +121,7 @@ 3.0.1 2.9.1 2.8.2 - 4.8.1 + 3.2.2 3.10.1 3.8 3.3.0