You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ma...@apache.org on 2022/11/01 10:36:27 UTC
[flink] 02/02: [FLINK-29624][Common][Connector][Filesystem] Upgrade org.apache.commons:commons-lang3 from 3.3.2 to 3.12.0
This is an automated email from the ASF dual-hosted git repository.
martijnvisser pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 68d93ab996e29694ea4d34b1a94a3e787ad2328c
Author: Martijn Visser <ma...@apache.org>
AuthorDate: Thu Oct 13 11:14:49 2022 +0200
[FLINK-29624][Common][Connector][Filesystem] Upgrade org.apache.commons:commons-lang3 from 3.3.2 to 3.12.0
* Remove Pulsar specific version of `commons-lang3` since Flink now uses a newer version
* Replace usage of deprecated method `org.apache.commons.lang3.ArrayUtils#add` with `org.apache.commons.lang3.ArrayUtils#insert`
* Replace usage of `org.apache.commons.lang3.StringEscapeUtils` with `org.apache.commons.text.StringEscapeUtils`
---
flink-connectors/flink-connector-pulsar/pom.xml | 10 ----------
.../src/main/resources/META-INF/NOTICE | 2 +-
.../src/main/resources/META-INF/NOTICE | 10 +++++-----
.../src/main/resources/META-INF/NOTICE | 2 +-
flink-core/pom.xml | 7 +++++++
flink-dist/src/main/resources/META-INF/NOTICE | 3 ++-
.../flink-fs-hadoop-shaded/src/main/resources/META-INF/NOTICE | 4 ++--
.../flink-s3-fs-hadoop/src/main/resources/META-INF/NOTICE | 4 ++--
.../flink-s3-fs-presto/src/main/resources/META-INF/NOTICE | 4 ++--
.../src/main/java/org/apache/flink/formats/csv/CsvCommons.java | 2 +-
.../org/apache/flink/formats/csv/CsvFileFormatFactory.java | 2 +-
.../java/org/apache/flink/formats/csv/CsvFormatFactory.java | 2 +-
.../apache/flink/optimizer/plandump/PlanJSONDumpGenerator.java | 2 +-
flink-runtime/pom.xml | 5 +++++
.../flink/runtime/jobgraph/jsonplan/JsonPlanGenerator.java | 2 +-
.../org/apache/flink/sql/parser/hive/ddl/HiveDDLUtils.java | 2 +-
.../flink/test/checkpointing/UnalignedCheckpointITCase.java | 4 ++--
.../test/checkpointing/UnalignedCheckpointRescaleITCase.java | 4 ++--
pom.xml | 8 +++++++-
19 files changed, 44 insertions(+), 35 deletions(-)
diff --git a/flink-connectors/flink-connector-pulsar/pom.xml b/flink-connectors/flink-connector-pulsar/pom.xml
index 04fd13b0477..83b370432a6 100644
--- a/flink-connectors/flink-connector-pulsar/pom.xml
+++ b/flink-connectors/flink-connector-pulsar/pom.xml
@@ -40,7 +40,6 @@ under the License.
<!-- Test Libraries -->
<protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
<os-maven-plugin.version>1.7.0</os-maven-plugin.version>
- <pulsar-commons-lang3.version>3.11</pulsar-commons-lang3.version>
<pulsar-netty.version>4.1.77.Final</pulsar-netty.version>
<pulsar-grpc.version>1.45.1</pulsar-grpc.version>
</properties>
@@ -136,15 +135,6 @@ under the License.
<scope>test</scope>
</dependency>
- <!-- Pulsar use a newer commons-lang3 in broker. -->
- <!-- Bump the version only for testing. -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${pulsar-commons-lang3.version}</version>
- <scope>test</scope>
- </dependency>
-
<!-- Add Pulsar 2.x as a dependency. -->
<!-- Move this to button for avoiding class conflicts with pulsar-broker. -->
diff --git a/flink-connectors/flink-sql-connector-hbase-2.2/src/main/resources/META-INF/NOTICE b/flink-connectors/flink-sql-connector-hbase-2.2/src/main/resources/META-INF/NOTICE
index 33e1d81eb62..1db3ea0cb0c 100644
--- a/flink-connectors/flink-sql-connector-hbase-2.2/src/main/resources/META-INF/NOTICE
+++ b/flink-connectors/flink-sql-connector-hbase-2.2/src/main/resources/META-INF/NOTICE
@@ -10,7 +10,7 @@ This project bundles the following dependencies under the Apache Software Licens
- io.netty:netty-all:4.1.70.Final
- io.dropwizard.metrics:metrics-core:3.2.6
- org.apache.commons:commons-crypto:1.0.0
- - org.apache.commons:commons-lang3:3.3.2
+ - org.apache.commons:commons-lang3:3.12.0
- org.apache.hbase:hbase-client:2.2.3
- org.apache.hbase:hbase-common:2.2.3
- org.apache.hbase:hbase-protocol:2.2.3
diff --git a/flink-connectors/flink-sql-connector-hive-3.1.3/src/main/resources/META-INF/NOTICE b/flink-connectors/flink-sql-connector-hive-3.1.3/src/main/resources/META-INF/NOTICE
index 18982ddf702..f87c73fba38 100644
--- a/flink-connectors/flink-sql-connector-hive-3.1.3/src/main/resources/META-INF/NOTICE
+++ b/flink-connectors/flink-sql-connector-hive-3.1.3/src/main/resources/META-INF/NOTICE
@@ -6,8 +6,8 @@ The Apache Software Foundation (http://www.apache.org/).
This project bundles the following dependencies under the Apache Software License 2.0. (http://www.apache.org/licenses/LICENSE-2.0.txt)
-- org.apache.avro:avro:1.8.2
- org.apache.avro:avro-mapred:hadoop2:1.8.2
+- org.apache.avro:avro:1.8.2
- org.apache.hive:hive-exec:3.1.3
This project bundles the following dependencies under the BSD license.
@@ -26,18 +26,18 @@ the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- javax.jdo:jdo-api:3.0.1
- joda-time:joda-time:2.9.9
- net.sf.opencsv:opencsv:2.3
-- org.apache.commons:commons-lang3:3.9
+- org.apache.commons:commons-lang3:3.12.0
+- org.apache.hive.shims:hive-shims-0.23:3.1.3
+- org.apache.hive.shims:hive-shims-common:3.1.3
- org.apache.hive:hive-common:3.1.3
- org.apache.hive:hive-llap-client:3.1.3
- org.apache.hive:hive-llap-common:3.1.3
- org.apache.hive:hive-metastore:3.1.3
- org.apache.hive:hive-serde:3.1.3
- org.apache.hive:hive-service-rpc:3.1.3
+- org.apache.hive:hive-spark-client:3.1.3
- org.apache.hive:hive-standalone-metastore:3.1.3
- org.apache.hive:hive-storage-api:2.7.0
-- org.apache.hive:hive-spark-client:3.1.3
-- org.apache.hive.shims:hive-shims-0.23:3.1.3
-- org.apache.hive.shims:hive-shims-common:3.1.3
- org.apache.orc:orc-core:1.5.8
- org.apache.orc:orc-shims:1.5.8
- org.apache.orc:orc-tools:1.5.8
diff --git a/flink-connectors/flink-sql-connector-kinesis/src/main/resources/META-INF/NOTICE b/flink-connectors/flink-sql-connector-kinesis/src/main/resources/META-INF/NOTICE
index 8c3db0f16b5..8b2f578479b 100644
--- a/flink-connectors/flink-sql-connector-kinesis/src/main/resources/META-INF/NOTICE
+++ b/flink-connectors/flink-sql-connector-kinesis/src/main/resources/META-INF/NOTICE
@@ -11,6 +11,6 @@ This project bundles the following dependencies under the Apache Software Licens
- commons-lang:commons-lang:2.6
- commons-logging:commons-logging:1.1.3
- commons-codec:commons-codec:1.15
-- org.apache.commons:commons-lang3:3.3.2
+- org.apache.commons:commons-lang3:3.12.0
- com.google.guava:guava:29.0-jre
- com.google.guava:failureaccess:1.0.1
diff --git a/flink-core/pom.xml b/flink-core/pom.xml
index be8a4b4f4f1..137fd03656a 100644
--- a/flink-core/pom.xml
+++ b/flink-core/pom.xml
@@ -63,6 +63,13 @@ under the License.
<!-- managed version -->
</dependency>
+ <!-- standard utilities -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <!-- managed version -->
+ </dependency>
+
<!-- for the fallback generic serializer -->
<dependency>
<groupId>com.esotericsoftware.kryo</groupId>
diff --git a/flink-dist/src/main/resources/META-INF/NOTICE b/flink-dist/src/main/resources/META-INF/NOTICE
index de9c7ee21f6..746b2406d5f 100644
--- a/flink-dist/src/main/resources/META-INF/NOTICE
+++ b/flink-dist/src/main/resources/META-INF/NOTICE
@@ -13,8 +13,9 @@ This project bundles the following dependencies under the Apache Software Licens
- commons-collections:commons-collections:3.2.2
- commons-io:commons-io:2.11.0
- org.apache.commons:commons-compress:1.21
-- org.apache.commons:commons-lang3:3.3.2
+- org.apache.commons:commons-lang3:3.12.0
- org.apache.commons:commons-math3:3.6.1
+- org.apache.commons:commons-text:1.10.0
- org.javassist:javassist:3.24.0-GA
- org.lz4:lz4-java:1.8.0
- org.objenesis:objenesis:2.1
diff --git a/flink-filesystems/flink-fs-hadoop-shaded/src/main/resources/META-INF/NOTICE b/flink-filesystems/flink-fs-hadoop-shaded/src/main/resources/META-INF/NOTICE
index 59f008cda31..2dedb09e325 100644
--- a/flink-filesystems/flink-fs-hadoop-shaded/src/main/resources/META-INF/NOTICE
+++ b/flink-filesystems/flink-fs-hadoop-shaded/src/main/resources/META-INF/NOTICE
@@ -20,8 +20,8 @@ This project bundles the following dependencies under the Apache Software Licens
- commons-logging:commons-logging:1.1.3
- org.apache.commons:commons-compress:1.21
- org.apache.commons:commons-configuration2:2.1.1
-- org.apache.commons:commons-lang3:3.3.2
-- org.apache.commons:commons-text:1.4
+- org.apache.commons:commons-lang3:3.12.0
+- org.apache.commons:commons-text:1.10.0
- org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1
- org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7:1.1.1
- org.apache.hadoop:hadoop-annotations:3.3.4
diff --git a/flink-filesystems/flink-s3-fs-hadoop/src/main/resources/META-INF/NOTICE b/flink-filesystems/flink-s3-fs-hadoop/src/main/resources/META-INF/NOTICE
index 450cc64809e..7f80c878443 100644
--- a/flink-filesystems/flink-s3-fs-hadoop/src/main/resources/META-INF/NOTICE
+++ b/flink-filesystems/flink-s3-fs-hadoop/src/main/resources/META-INF/NOTICE
@@ -26,8 +26,8 @@ This project bundles the following dependencies under the Apache Software Licens
- joda-time:joda-time:2.5
- org.apache.commons:commons-compress:1.21
- org.apache.commons:commons-configuration2:2.1.1
-- org.apache.commons:commons-lang3:3.3.2
-- org.apache.commons:commons-text:1.4
+- org.apache.commons:commons-lang3:3.12.0
+- org.apache.commons:commons-text:1.10.0
- org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1
- org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7:1.1.1
- org.apache.hadoop:hadoop-annotations:3.3.4
diff --git a/flink-filesystems/flink-s3-fs-presto/src/main/resources/META-INF/NOTICE b/flink-filesystems/flink-s3-fs-presto/src/main/resources/META-INF/NOTICE
index 204bba36d89..f83c0808313 100644
--- a/flink-filesystems/flink-s3-fs-presto/src/main/resources/META-INF/NOTICE
+++ b/flink-filesystems/flink-s3-fs-presto/src/main/resources/META-INF/NOTICE
@@ -38,8 +38,8 @@ This project bundles the following dependencies under the Apache Software Licens
- org.alluxio:alluxio-shaded-client:2.7.3
- org.apache.commons:commons-compress:1.21
- org.apache.commons:commons-configuration2:2.1.1
-- org.apache.commons:commons-lang3:3.3.2
-- org.apache.commons:commons-text:1.4
+- org.apache.commons:commons-lang3:3.12.0
+- org.apache.commons:commons-text:1.10.0
- org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1
- org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7:1.1.1
- org.apache.hadoop:hadoop-annotations:3.3.4
diff --git a/flink-formats/flink-csv/src/main/java/org/apache/flink/formats/csv/CsvCommons.java b/flink-formats/flink-csv/src/main/java/org/apache/flink/formats/csv/CsvCommons.java
index 7d15bfb985b..9bf5520574d 100644
--- a/flink-formats/flink-csv/src/main/java/org/apache/flink/formats/csv/CsvCommons.java
+++ b/flink-formats/flink-csv/src/main/java/org/apache/flink/formats/csv/CsvCommons.java
@@ -22,7 +22,7 @@ import org.apache.flink.configuration.ConfigOption;
import org.apache.flink.configuration.ReadableConfig;
import org.apache.flink.table.api.ValidationException;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
import java.util.HashSet;
import java.util.Set;
diff --git a/flink-formats/flink-csv/src/main/java/org/apache/flink/formats/csv/CsvFileFormatFactory.java b/flink-formats/flink-csv/src/main/java/org/apache/flink/formats/csv/CsvFileFormatFactory.java
index f977acd5b4f..9a4bf9bf540 100644
--- a/flink-formats/flink-csv/src/main/java/org/apache/flink/formats/csv/CsvFileFormatFactory.java
+++ b/flink-formats/flink-csv/src/main/java/org/apache/flink/formats/csv/CsvFileFormatFactory.java
@@ -53,7 +53,7 @@ import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.Obje
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.dataformat.csv.CsvMapper;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.dataformat.csv.CsvSchema;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
import java.util.Collections;
import java.util.List;
diff --git a/flink-formats/flink-csv/src/main/java/org/apache/flink/formats/csv/CsvFormatFactory.java b/flink-formats/flink-csv/src/main/java/org/apache/flink/formats/csv/CsvFormatFactory.java
index 2db1a9f695c..a54bd618df2 100644
--- a/flink-formats/flink-csv/src/main/java/org/apache/flink/formats/csv/CsvFormatFactory.java
+++ b/flink-formats/flink-csv/src/main/java/org/apache/flink/formats/csv/CsvFormatFactory.java
@@ -39,7 +39,7 @@ import org.apache.flink.table.factories.SerializationFormatFactory;
import org.apache.flink.table.types.DataType;
import org.apache.flink.table.types.logical.RowType;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
import java.util.Collections;
import java.util.Set;
diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plandump/PlanJSONDumpGenerator.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plandump/PlanJSONDumpGenerator.java
index eb825b50803..491f1d98201 100644
--- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plandump/PlanJSONDumpGenerator.java
+++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plandump/PlanJSONDumpGenerator.java
@@ -41,7 +41,7 @@ import org.apache.flink.runtime.operators.DriverStrategy;
import org.apache.flink.runtime.operators.shipping.ShipStrategyType;
import org.apache.flink.util.StringUtils;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
import java.io.File;
import java.io.FileOutputStream;
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index c7a8887259b..a9e50b3fcb2 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -142,6 +142,11 @@ under the License.
<artifactId>commons-lang3</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </dependency>
+
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/jsonplan/JsonPlanGenerator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/jsonplan/JsonPlanGenerator.java
index 30414506435..8817c72282b 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/jsonplan/JsonPlanGenerator.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/jsonplan/JsonPlanGenerator.java
@@ -30,7 +30,7 @@ import org.apache.flink.runtime.scheduler.adaptive.allocator.VertexParallelism;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonFactory;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
import java.io.StringWriter;
import java.util.Collections;
diff --git a/flink-table/flink-sql-parser-hive/src/main/java/org/apache/flink/sql/parser/hive/ddl/HiveDDLUtils.java b/flink-table/flink-sql-parser-hive/src/main/java/org/apache/flink/sql/parser/hive/ddl/HiveDDLUtils.java
index f91927d8b14..c16aa77ebf1 100644
--- a/flink-table/flink-sql-parser-hive/src/main/java/org/apache/flink/sql/parser/hive/ddl/HiveDDLUtils.java
+++ b/flink-table/flink-sql-parser-hive/src/main/java/org/apache/flink/sql/parser/hive/ddl/HiveDDLUtils.java
@@ -40,7 +40,7 @@ import org.apache.calcite.sql.parser.SqlParserPos;
import org.apache.calcite.sql.type.SqlTypeName;
import org.apache.calcite.sql.util.SqlShuttle;
import org.apache.calcite.util.NlsString;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointITCase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointITCase.java
index c75c8db17f3..5a6efd174e1 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointITCase.java
@@ -247,8 +247,8 @@ public class UnalignedCheckpointITCase extends UnalignedCheckpointTestBase {
.map(
params ->
new Object[][] {
- ArrayUtils.add(params, 0),
- ArrayUtils.add(params, BUFFER_PER_CHANNEL)
+ ArrayUtils.insert(params.length, params, 0),
+ ArrayUtils.insert(params.length, params, BUFFER_PER_CHANNEL)
})
.flatMap(Arrays::stream)
.toArray(Object[][]::new);
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointRescaleITCase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointRescaleITCase.java
index fd89c38a655..4216cc5469b 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointRescaleITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointRescaleITCase.java
@@ -504,8 +504,8 @@ public class UnalignedCheckpointRescaleITCase extends UnalignedCheckpointTestBas
.map(
params ->
new Object[][] {
- ArrayUtils.add(params, 0),
- ArrayUtils.add(params, BUFFER_PER_CHANNEL)
+ ArrayUtils.insert(params.length, params, 0),
+ ArrayUtils.insert(params.length, params, BUFFER_PER_CHANNEL)
})
.flatMap(Arrays::stream)
.toArray(Object[][]::new);
diff --git a/pom.xml b/pom.xml
index d3ecb94f3b1..022337f5f2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -532,7 +532,13 @@ under the License.
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.3.2</version>
+ <version>3.12.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>1.10.0</version>
</dependency>
<dependency>