This is an automated email from the ASF dual-hosted git repository. pnowojski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 1226ab58a162b72e5929a118fe1f75815260a51f Author: Piotr Nowojski <[email protected]> AuthorDate: Wed Mar 6 17:13:47 2024 +0100 [hotfix] Move CompressionUtils to flink-core --- .../src/main/java/org/apache/flink}/util/CompressionUtils.java | 4 +--- .../src/main/java/org/apache/flink/client/python/PythonEnvUtils.java | 2 +- .../org/apache/flink/python/env/AbstractPythonEnvironmentManager.java | 2 +- .../test/java/org/apache/flink/python/util/CompressionUtilsTest.java | 1 + 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/flink-python/src/main/java/org/apache/flink/python/util/CompressionUtils.java b/flink-core/src/main/java/org/apache/flink/util/CompressionUtils.java similarity index 99% rename from flink-python/src/main/java/org/apache/flink/python/util/CompressionUtils.java rename to flink-core/src/main/java/org/apache/flink/util/CompressionUtils.java index 147ad5b8baa..06fb73be955 100644 --- a/flink-python/src/main/java/org/apache/flink/python/util/CompressionUtils.java +++ b/flink-core/src/main/java/org/apache/flink/util/CompressionUtils.java @@ -16,11 +16,9 @@ * limitations under the License. */ -package org.apache.flink.python.util; +package org.apache.flink.util; import org.apache.flink.annotation.Internal; -import org.apache.flink.util.IOUtils; -import org.apache.flink.util.OperatingSystem; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; diff --git a/flink-python/src/main/java/org/apache/flink/client/python/PythonEnvUtils.java b/flink-python/src/main/java/org/apache/flink/client/python/PythonEnvUtils.java index 4f83c85ee80..8ff6aaaac6f 100644 --- a/flink-python/src/main/java/org/apache/flink/client/python/PythonEnvUtils.java +++ b/flink-python/src/main/java/org/apache/flink/client/python/PythonEnvUtils.java @@ -22,8 +22,8 @@ import org.apache.flink.client.deployment.application.UnsuccessfulExecutionExcep import org.apache.flink.configuration.ConfigConstants; import org.apache.flink.configuration.ReadableConfig; import org.apache.flink.core.fs.Path; -import org.apache.flink.python.util.CompressionUtils; import org.apache.flink.python.util.PythonDependencyUtils; +import org.apache.flink.util.CompressionUtils; import org.apache.flink.util.ExceptionUtils; import org.apache.flink.util.FileUtils; import org.apache.flink.util.NetUtils; diff --git a/flink-python/src/main/java/org/apache/flink/python/env/AbstractPythonEnvironmentManager.java b/flink-python/src/main/java/org/apache/flink/python/env/AbstractPythonEnvironmentManager.java index 8e72169bcc1..66bd5a4a0f3 100644 --- a/flink-python/src/main/java/org/apache/flink/python/env/AbstractPythonEnvironmentManager.java +++ b/flink-python/src/main/java/org/apache/flink/python/env/AbstractPythonEnvironmentManager.java @@ -22,8 +22,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.JobID; import org.apache.flink.api.java.tuple.Tuple2; -import org.apache.flink.python.util.CompressionUtils; import org.apache.flink.python.util.PythonEnvironmentManagerUtils; +import org.apache.flink.util.CompressionUtils; import org.apache.flink.util.FileUtils; import org.apache.flink.util.Preconditions; import org.apache.flink.util.ShutdownHookUtil; diff --git a/flink-python/src/test/java/org/apache/flink/python/util/CompressionUtilsTest.java b/flink-python/src/test/java/org/apache/flink/python/util/CompressionUtilsTest.java index 741891f0387..7edaafb67e7 100644 --- a/flink-python/src/test/java/org/apache/flink/python/util/CompressionUtilsTest.java +++ b/flink-python/src/test/java/org/apache/flink/python/util/CompressionUtilsTest.java @@ -18,6 +18,7 @@ package org.apache.flink.python.util; import org.apache.flink.configuration.ConfigConstants; +import org.apache.flink.util.CompressionUtils; import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
