diff --git a/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/f7a4e6fa-e7de-48c9-a61e-c13e83f0c72e b/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/f7a4e6fa-e7de-48c9-a61e-c13e83f0c72e index 0fd86b294303a..cafa384fe7f34 100644 --- a/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/f7a4e6fa-e7de-48c9-a61e-c13e83f0c72e +++ b/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/f7a4e6fa-e7de-48c9-a61e-c13e83f0c72e @@ -340,7 +340,7 @@ Method calls method in (RandomGeneratorVisitor.java:292) Method calls method in (RandomGeneratorVisitor.java:293) Method calls method in (RandomGeneratorVisitor.java:331) -Method calls method in (SequenceGeneratorVisitor.java:221) +Method calls method in (SequenceGeneratorVisitor.java:221) Method has return type in (SequenceGeneratorVisitor.java:0) Method has return type in (SequenceGeneratorVisitor.java:0) Method calls method in (SequenceGeneratorVisitor.java:172) diff --git a/flink-clients/src/main/java/org/apache/flink/client/program/StreamContextEnvironment.java b/flink-clients/src/main/java/org/apache/flink/client/program/StreamContextEnvironment.java index 055ebf7740123..09af40d5f620f 100644 --- a/flink-clients/src/main/java/org/apache/flink/client/program/StreamContextEnvironment.java +++ b/flink-clients/src/main/java/org/apache/flink/client/program/StreamContextEnvironment.java @@ -39,8 +39,8 @@ import org.apache.flink.util.FlinkRuntimeException; import org.apache.flink.util.ShutdownHookUtil; -import org.apache.flink.shaded.guava32.com.google.common.collect.MapDifference; -import org.apache.flink.shaded.guava32.com.google.common.collect.Maps; +import org.apache.flink.shaded.guava31.com.google.common.collect.MapDifference; +import org.apache.flink.shaded.guava31.com.google.common.collect.Maps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-clients/src/main/java/org/apache/flink/client/program/rest/UrlPrefixDecorator.java b/flink-clients/src/main/java/org/apache/flink/client/program/rest/UrlPrefixDecorator.java index fb2aed3edf5eb..52f1b8cf56ea3 100644 --- a/flink-clients/src/main/java/org/apache/flink/client/program/rest/UrlPrefixDecorator.java +++ b/flink-clients/src/main/java/org/apache/flink/client/program/rest/UrlPrefixDecorator.java @@ -30,7 +30,7 @@ import java.util.Collection; -import static org.apache.flink.shaded.guava32.com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.shaded.guava31.com.google.common.base.Preconditions.checkNotNull; /** * This class decorates the URL of the original message headers by adding a prefix. The purpose of diff --git a/flink-clients/src/test/java/org/apache/flink/client/deployment/application/JarManifestParserTest.java b/flink-clients/src/test/java/org/apache/flink/client/deployment/application/JarManifestParserTest.java index 5e2ec0e56a8c8..51709dfaf1b70 100644 --- a/flink-clients/src/test/java/org/apache/flink/client/deployment/application/JarManifestParserTest.java +++ b/flink-clients/src/test/java/org/apache/flink/client/deployment/application/JarManifestParserTest.java @@ -21,8 +21,8 @@ import org.apache.flink.client.program.PackagedProgram; import org.apache.flink.client.testjar.TestJob; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableMap; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/flink-clients/src/test/java/org/apache/flink/client/program/PerJobMiniClusterFactoryTest.java b/flink-clients/src/test/java/org/apache/flink/client/program/PerJobMiniClusterFactoryTest.java index 6302d5a1cb9df..8be26514c2682 100644 --- a/flink-clients/src/test/java/org/apache/flink/client/program/PerJobMiniClusterFactoryTest.java +++ b/flink-clients/src/test/java/org/apache/flink/client/program/PerJobMiniClusterFactoryTest.java @@ -32,7 +32,7 @@ import org.apache.flink.runtime.testutils.CancelableInvokable; import org.apache.flink.runtime.testutils.WaitingCancelableInvokable; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableMap; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/flink-clients/src/test/java/org/apache/flink/client/testjar/ForbidConfigurationJob.java b/flink-clients/src/test/java/org/apache/flink/client/testjar/ForbidConfigurationJob.java index af177b00f0b34..8e7f0222e2af4 100644 --- a/flink-clients/src/test/java/org/apache/flink/client/testjar/ForbidConfigurationJob.java +++ b/flink-clients/src/test/java/org/apache/flink/client/testjar/ForbidConfigurationJob.java @@ -23,7 +23,7 @@ import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.functions.sink.v2.DiscardingSink; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; /** Simulate a class setting a configuration. */ public class ForbidConfigurationJob { diff --git a/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/HiveParserCalcitePlanner.java b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/HiveParserCalcitePlanner.java index 210ef9ba016df..d4078fe9b49b0 100644 --- a/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/HiveParserCalcitePlanner.java +++ b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/HiveParserCalcitePlanner.java @@ -58,7 +58,7 @@ import org.apache.flink.util.CollectionUtil; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; import org.apache.calcite.plan.RelOptCluster; import org.apache.calcite.plan.RelTraitSet; diff --git a/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/FlinkEmbeddedHiveRunner.java b/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/FlinkEmbeddedHiveRunner.java index b606b6bb668da..4003a25733e20 100644 --- a/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/FlinkEmbeddedHiveRunner.java +++ b/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/FlinkEmbeddedHiveRunner.java @@ -20,7 +20,7 @@ import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava32.com.google.common.io.Resources; +import org.apache.flink.shaded.guava31.com.google.common.io.Resources; import com.klarna.hiverunner.HiveServerContainer; import com.klarna.hiverunner.HiveServerContext; diff --git a/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/FlinkStandaloneHiveRunner.java b/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/FlinkStandaloneHiveRunner.java index 1cf557c7f2890..43c4c29bd02f2 100644 --- a/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/FlinkStandaloneHiveRunner.java +++ b/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/FlinkStandaloneHiveRunner.java @@ -20,8 +20,8 @@ import org.apache.flink.table.catalog.hive.HiveTestUtils; -import org.apache.flink.shaded.guava32.com.google.common.base.Joiner; -import org.apache.flink.shaded.guava32.com.google.common.base.Throwables; +import org.apache.flink.shaded.guava31.com.google.common.base.Joiner; +import org.apache.flink.shaded.guava31.com.google.common.base.Throwables; import com.klarna.hiverunner.HiveServerContext; import org.apache.hadoop.hive.conf.HiveConf; diff --git a/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/HiveTableSinkITCase.java b/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/HiveTableSinkITCase.java index 816555894a3b2..7d5ca401c6182 100644 --- a/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/HiveTableSinkITCase.java +++ b/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/HiveTableSinkITCase.java @@ -44,7 +44,7 @@ import org.apache.flink.util.CollectionUtil; import org.apache.flink.util.TestLoggerExtension; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.apache.hadoop.hive.conf.HiveConf; import org.junit.jupiter.api.AfterAll; diff --git a/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/table/catalog/hive/HiveCatalogITCase.java b/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/table/catalog/hive/HiveCatalogITCase.java index 21f0d95467e2c..d1719d56b77f0 100644 --- a/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/table/catalog/hive/HiveCatalogITCase.java +++ b/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/table/catalog/hive/HiveCatalogITCase.java @@ -47,7 +47,7 @@ import org.apache.flink.util.CollectionUtil; import org.apache.flink.util.FileUtils; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/io/OutputFormatBase.java b/flink-core/src/main/java/org/apache/flink/api/common/io/OutputFormatBase.java index 0834fa94f988a..0126228a2d885 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/io/OutputFormatBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/io/OutputFormatBase.java @@ -22,7 +22,7 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava32.com.google.common.util.concurrent.FutureCallback; +import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.FutureCallback; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/io/ratelimiting/GuavaFlinkConnectorRateLimiter.java b/flink-core/src/main/java/org/apache/flink/api/common/io/ratelimiting/GuavaFlinkConnectorRateLimiter.java index 0973d8780ce86..f74b7176b12fa 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/io/ratelimiting/GuavaFlinkConnectorRateLimiter.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/io/ratelimiting/GuavaFlinkConnectorRateLimiter.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.functions.RuntimeContext; -import org.apache.flink.shaded.guava32.com.google.common.util.concurrent.RateLimiter; +import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.RateLimiter; /** * An implementation of {@link FlinkConnectorRateLimiter} that uses Guava's RateLimiter for rate diff --git a/flink-core/src/main/java/org/apache/flink/api/connector/source/util/ratelimit/GuavaRateLimiter.java b/flink-core/src/main/java/org/apache/flink/api/connector/source/util/ratelimit/GuavaRateLimiter.java index 4ce13cd7d3478..e0cbb35d2db1b 100644 --- a/flink-core/src/main/java/org/apache/flink/api/connector/source/util/ratelimit/GuavaRateLimiter.java +++ b/flink-core/src/main/java/org/apache/flink/api/connector/source/util/ratelimit/GuavaRateLimiter.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.util.concurrent.ExecutorThreadFactory; -import org.apache.flink.shaded.guava32.com.google.common.util.concurrent.RateLimiter; +import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.RateLimiter; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/JavaRecordBuilderFactory.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/JavaRecordBuilderFactory.java index 99011a2fe0f60..ff5eefe2ee19a 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/JavaRecordBuilderFactory.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/JavaRecordBuilderFactory.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava32.com.google.common.base.Defaults; +import org.apache.flink.shaded.guava31.com.google.common.base.Defaults; import javax.annotation.Nullable; diff --git a/flink-core/src/main/java/org/apache/flink/configuration/CleanupOptions.java b/flink-core/src/main/java/org/apache/flink/configuration/CleanupOptions.java index 3f3c0268ce748..8c913da861fde 100644 --- a/flink-core/src/main/java/org/apache/flink/configuration/CleanupOptions.java +++ b/flink-core/src/main/java/org/apache/flink/configuration/CleanupOptions.java @@ -25,7 +25,7 @@ import org.apache.flink.configuration.description.Description; import org.apache.flink.configuration.description.TextElement; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableSet; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableSet; import java.time.Duration; import java.util.Set; diff --git a/flink-core/src/main/java/org/apache/flink/configuration/CoreOptions.java b/flink-core/src/main/java/org/apache/flink/configuration/CoreOptions.java index 03b92b328c6c3..c4d50ce1072df 100644 --- a/flink-core/src/main/java/org/apache/flink/configuration/CoreOptions.java +++ b/flink-core/src/main/java/org/apache/flink/configuration/CoreOptions.java @@ -26,7 +26,7 @@ import org.apache.flink.configuration.description.Description; import org.apache.flink.util.ArrayUtils; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import java.util.List; diff --git a/flink-core/src/main/java/org/apache/flink/configuration/description/TextElement.java b/flink-core/src/main/java/org/apache/flink/configuration/description/TextElement.java index a5dea78884507..562ae2f59722f 100644 --- a/flink-core/src/main/java/org/apache/flink/configuration/description/TextElement.java +++ b/flink-core/src/main/java/org/apache/flink/configuration/description/TextElement.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.PublicEvolving; -import org.apache.flink.shaded.guava32.com.google.common.base.Strings; +import org.apache.flink.shaded.guava31.com.google.common.base.Strings; import java.util.Arrays; import java.util.Collections; diff --git a/flink-core/src/main/java/org/apache/flink/core/classloading/ComponentClassLoader.java b/flink-core/src/main/java/org/apache/flink/core/classloading/ComponentClassLoader.java index 11e126ea0fbf8..5064d7fced68c 100644 --- a/flink-core/src/main/java/org/apache/flink/core/classloading/ComponentClassLoader.java +++ b/flink-core/src/main/java/org/apache/flink/core/classloading/ComponentClassLoader.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.util.function.FunctionWithException; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterators; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterators; import java.io.IOException; import java.io.InputStream; diff --git a/flink-core/src/main/java/org/apache/flink/core/fs/AutoCloseableRegistry.java b/flink-core/src/main/java/org/apache/flink/core/fs/AutoCloseableRegistry.java index 7ebae25b8c675..47f6a576e64c3 100644 --- a/flink-core/src/main/java/org/apache/flink/core/fs/AutoCloseableRegistry.java +++ b/flink-core/src/main/java/org/apache/flink/core/fs/AutoCloseableRegistry.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; -import static org.apache.flink.shaded.guava32.com.google.common.collect.Lists.reverse; +import static org.apache.flink.shaded.guava31.com.google.common.collect.Lists.reverse; /** * This class allows to register instances of {@link AutoCloseable}, which are all closed if this diff --git a/flink-core/src/main/java/org/apache/flink/core/fs/CloseableRegistry.java b/flink-core/src/main/java/org/apache/flink/core/fs/CloseableRegistry.java index 2bed462a0e308..fbe285d636e75 100644 --- a/flink-core/src/main/java/org/apache/flink/core/fs/CloseableRegistry.java +++ b/flink-core/src/main/java/org/apache/flink/core/fs/CloseableRegistry.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; -import static org.apache.flink.shaded.guava32.com.google.common.collect.Lists.reverse; +import static org.apache.flink.shaded.guava31.com.google.common.collect.Lists.reverse; /** * This class allows to register instances of {@link Closeable}, which are all closed if this diff --git a/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java b/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java index cee47823e1f18..8c9b6c2c12b77 100644 --- a/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java +++ b/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java @@ -35,10 +35,10 @@ import org.apache.flink.util.ExceptionUtils; import org.apache.flink.util.TemporaryClassLoaderContext; -import org.apache.flink.shaded.guava32.com.google.common.base.Splitter; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableMultimap; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterators; -import org.apache.flink.shaded.guava32.com.google.common.collect.Multimap; +import org.apache.flink.shaded.guava31.com.google.common.base.Splitter; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMultimap; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterators; +import org.apache.flink.shaded.guava31.com.google.common.collect.Multimap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-core/src/main/java/org/apache/flink/core/plugin/DefaultPluginManager.java b/flink-core/src/main/java/org/apache/flink/core/plugin/DefaultPluginManager.java index 0a4243c4fed0f..c77892356f33e 100644 --- a/flink-core/src/main/java/org/apache/flink/core/plugin/DefaultPluginManager.java +++ b/flink-core/src/main/java/org/apache/flink/core/plugin/DefaultPluginManager.java @@ -21,8 +21,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.shaded.guava32.com.google.common.base.Joiner; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterators; +import org.apache.flink.shaded.guava31.com.google.common.base.Joiner; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterators; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-core/src/main/java/org/apache/flink/util/FileUtils.java b/flink-core/src/main/java/org/apache/flink/util/FileUtils.java index a75df3d643ba9..e09ec67f98753 100644 --- a/flink-core/src/main/java/org/apache/flink/util/FileUtils.java +++ b/flink-core/src/main/java/org/apache/flink/util/FileUtils.java @@ -652,7 +652,7 @@ public static java.nio.file.Path getCurrentWorkingDirectory() { */ public static boolean isJarFile(java.nio.file.Path file) { return JAR_FILE_EXTENSION.equals( - org.apache.flink.shaded.guava32.com.google.common.io.Files.getFileExtension( + org.apache.flink.shaded.guava31.com.google.common.io.Files.getFileExtension( file.toString())); } @@ -664,7 +664,7 @@ public static boolean isJarFile(java.nio.file.Path file) { */ public static String stripFileExtension(String fileName) { final String extension = - org.apache.flink.shaded.guava32.com.google.common.io.Files.getFileExtension( + org.apache.flink.shaded.guava31.com.google.common.io.Files.getFileExtension( fileName); if (!extension.isEmpty()) { return fileName.substring(0, fileName.lastIndexOf(extension) - 1); diff --git a/flink-core/src/main/java/org/apache/flink/util/NetUtils.java b/flink-core/src/main/java/org/apache/flink/util/NetUtils.java index 5e9da0da97388..09f178ee7362a 100644 --- a/flink-core/src/main/java/org/apache/flink/util/NetUtils.java +++ b/flink-core/src/main/java/org/apache/flink/util/NetUtils.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.configuration.IllegalConfigurationException; -import org.apache.flink.shaded.guava32.com.google.common.net.InetAddresses; +import org.apache.flink.shaded.guava31.com.google.common.net.InetAddresses; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-core/src/test/java/org/apache/flink/configuration/ConfigOptionTest.java b/flink-core/src/test/java/org/apache/flink/configuration/ConfigOptionTest.java index af8aee5b05bfb..1acc8ad46edc3 100644 --- a/flink-core/src/test/java/org/apache/flink/configuration/ConfigOptionTest.java +++ b/flink-core/src/test/java/org/apache/flink/configuration/ConfigOptionTest.java @@ -20,7 +20,7 @@ import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.Sets; +import org.apache.flink.shaded.guava31.com.google.common.collect.Sets; import org.junit.Test; diff --git a/flink-core/src/test/java/org/apache/flink/core/io/SimpleVersionedSerializationTest.java b/flink-core/src/test/java/org/apache/flink/core/io/SimpleVersionedSerializationTest.java index c235e9bc8d372..6fb4f10988026 100644 --- a/flink-core/src/test/java/org/apache/flink/core/io/SimpleVersionedSerializationTest.java +++ b/flink-core/src/test/java/org/apache/flink/core/io/SimpleVersionedSerializationTest.java @@ -21,7 +21,7 @@ import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; import org.junit.Test; diff --git a/flink-core/src/test/java/org/apache/flink/core/plugin/PluginConfigTest.java b/flink-core/src/test/java/org/apache/flink/core/plugin/PluginConfigTest.java index 40c4d3fe41ba4..2102b18dd6dd5 100644 --- a/flink-core/src/test/java/org/apache/flink/core/plugin/PluginConfigTest.java +++ b/flink-core/src/test/java/org/apache/flink/core/plugin/PluginConfigTest.java @@ -22,7 +22,7 @@ import org.apache.flink.core.testutils.CommonTestUtils; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableMap; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap; import org.junit.After; import org.junit.BeforeClass; diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml index 307b1bd4904f2..0cc506f510354 100644 --- a/flink-dist/pom.xml +++ b/flink-dist/pom.xml @@ -52,40 +52,6 @@ under the License. flink-core ${project.version} ${flink.markBundledAsOptional} - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - - - com.fasterxml.jackson.dataformat - jackson-dataformat-csv - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - com.fasterxml.jackson.datatype - jackson-datatype-jdk8 - - - org.yaml - snakeyaml - - diff --git a/flink-dist/src/test/java/org/apache/flink/dist/BashJavaUtilsITCase.java b/flink-dist/src/test/java/org/apache/flink/dist/BashJavaUtilsITCase.java index f3a9d1b44a13d..55b12f10653fe 100644 --- a/flink-dist/src/test/java/org/apache/flink/dist/BashJavaUtilsITCase.java +++ b/flink-dist/src/test/java/org/apache/flink/dist/BashJavaUtilsITCase.java @@ -27,7 +27,7 @@ import org.apache.flink.runtime.util.bash.BashJavaUtils; import org.apache.flink.testutils.junit.utils.TempDirUtils; -import org.apache.flink.shaded.guava32.com.google.common.collect.Sets; +import org.apache.flink.shaded.guava31.com.google.common.collect.Sets; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/flink-dstl/flink-dstl-dfs/src/main/java/org/apache/flink/changelog/fs/AbstractStateChangeFsUploader.java b/flink-dstl/flink-dstl-dfs/src/main/java/org/apache/flink/changelog/fs/AbstractStateChangeFsUploader.java index d1802024fbb0c..dd1d53c9bcbff 100644 --- a/flink-dstl/flink-dstl-dfs/src/main/java/org/apache/flink/changelog/fs/AbstractStateChangeFsUploader.java +++ b/flink-dstl/flink-dstl-dfs/src/main/java/org/apache/flink/changelog/fs/AbstractStateChangeFsUploader.java @@ -25,7 +25,7 @@ import org.apache.flink.util.clock.Clock; import org.apache.flink.util.clock.SystemClock; -import org.apache.flink.shaded.guava32.com.google.common.io.Closer; +import org.apache.flink.shaded.guava31.com.google.common.io.Closer; import java.io.IOException; import java.util.Collection; diff --git a/flink-dstl/flink-dstl-dfs/src/test/java/org/apache/flink/changelog/fs/FsStateChangelogWriterTest.java b/flink-dstl/flink-dstl-dfs/src/test/java/org/apache/flink/changelog/fs/FsStateChangelogWriterTest.java index 4a9961b2414b4..12f1df85d27ce 100644 --- a/flink-dstl/flink-dstl-dfs/src/test/java/org/apache/flink/changelog/fs/FsStateChangelogWriterTest.java +++ b/flink-dstl/flink-dstl-dfs/src/test/java/org/apache/flink/changelog/fs/FsStateChangelogWriterTest.java @@ -38,7 +38,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; -import static org.apache.flink.shaded.guava32.com.google.common.collect.Iterables.getOnlyElement; +import static org.apache.flink.shaded.guava31.com.google.common.collect.Iterables.getOnlyElement; import static org.apache.flink.util.ExceptionUtils.rethrowIOException; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/flink-end-to-end-tests/flink-queryable-state-test/src/main/java/org/apache/flink/streaming/tests/queryablestate/QsStateProducer.java b/flink-end-to-end-tests/flink-queryable-state-test/src/main/java/org/apache/flink/streaming/tests/queryablestate/QsStateProducer.java index 67b53f1427476..252dcb8803104 100644 --- a/flink-end-to-end-tests/flink-queryable-state-test/src/main/java/org/apache/flink/streaming/tests/queryablestate/QsStateProducer.java +++ b/flink-end-to-end-tests/flink-queryable-state-test/src/main/java/org/apache/flink/streaming/tests/queryablestate/QsStateProducer.java @@ -37,7 +37,7 @@ import org.apache.flink.streaming.api.functions.source.RichSourceFunction; import org.apache.flink.util.Collector; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import java.time.Duration; import java.time.Instant; diff --git a/flink-filesystems/flink-gs-fs-hadoop/src/main/java/org/apache/flink/fs/gs/utils/ChecksumUtils.java b/flink-filesystems/flink-gs-fs-hadoop/src/main/java/org/apache/flink/fs/gs/utils/ChecksumUtils.java index d74ee52cfbc53..aac614800ec1e 100644 --- a/flink-filesystems/flink-gs-fs-hadoop/src/main/java/org/apache/flink/fs/gs/utils/ChecksumUtils.java +++ b/flink-filesystems/flink-gs-fs-hadoop/src/main/java/org/apache/flink/fs/gs/utils/ChecksumUtils.java @@ -18,8 +18,8 @@ package org.apache.flink.fs.gs.utils; -import org.apache.flink.shaded.guava32.com.google.common.hash.HashFunction; -import org.apache.flink.shaded.guava32.com.google.common.hash.Hashing; +import org.apache.flink.shaded.guava31.com.google.common.hash.HashFunction; +import org.apache.flink.shaded.guava31.com.google.common.hash.Hashing; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/flink-filesystems/flink-gs-fs-hadoop/src/main/java/org/apache/flink/fs/gs/writer/GSChecksumWriteChannel.java b/flink-filesystems/flink-gs-fs-hadoop/src/main/java/org/apache/flink/fs/gs/writer/GSChecksumWriteChannel.java index 5ebde911601a6..c496d4d9086f2 100644 --- a/flink-filesystems/flink-gs-fs-hadoop/src/main/java/org/apache/flink/fs/gs/writer/GSChecksumWriteChannel.java +++ b/flink-filesystems/flink-gs-fs-hadoop/src/main/java/org/apache/flink/fs/gs/writer/GSChecksumWriteChannel.java @@ -23,7 +23,7 @@ import org.apache.flink.fs.gs.utils.ChecksumUtils; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava32.com.google.common.hash.Hasher; +import org.apache.flink.shaded.guava31.com.google.common.hash.Hasher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-filesystems/flink-gs-fs-hadoop/src/test/java/org/apache/flink/fs/gs/utils/ConfigUtilsHadoopTest.java b/flink-filesystems/flink-gs-fs-hadoop/src/test/java/org/apache/flink/fs/gs/utils/ConfigUtilsHadoopTest.java index 77ca16363e12b..1a554ba8f1815 100644 --- a/flink-filesystems/flink-gs-fs-hadoop/src/test/java/org/apache/flink/fs/gs/utils/ConfigUtilsHadoopTest.java +++ b/flink-filesystems/flink-gs-fs-hadoop/src/test/java/org/apache/flink/fs/gs/utils/ConfigUtilsHadoopTest.java @@ -21,8 +21,8 @@ import org.apache.flink.configuration.Configuration; import org.apache.flink.fs.gs.TestUtils; -import org.apache.flink.shaded.guava32.com.google.common.collect.MapDifference; -import org.apache.flink.shaded.guava32.com.google.common.collect.Maps; +import org.apache.flink.shaded.guava31.com.google.common.collect.MapDifference; +import org.apache.flink.shaded.guava31.com.google.common.collect.Maps; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/flink-filesystems/flink-s3-fs-base/src/test/java/org/apache/flink/fs/s3/common/HAJobRunOnMinioS3StoreITCase.java b/flink-filesystems/flink-s3-fs-base/src/test/java/org/apache/flink/fs/s3/common/HAJobRunOnMinioS3StoreITCase.java index 8c078911f5c1a..4ae048ba53924 100644 --- a/flink-filesystems/flink-s3-fs-base/src/test/java/org/apache/flink/fs/s3/common/HAJobRunOnMinioS3StoreITCase.java +++ b/flink-filesystems/flink-s3-fs-base/src/test/java/org/apache/flink/fs/s3/common/HAJobRunOnMinioS3StoreITCase.java @@ -30,7 +30,7 @@ import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration; import org.apache.flink.test.junit5.MiniClusterExtension; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import com.amazonaws.services.s3.model.S3ObjectSummary; import org.apache.commons.lang3.StringUtils; @@ -40,7 +40,7 @@ import java.util.List; -import static org.apache.flink.shaded.guava32.com.google.common.base.Predicates.not; +import static org.apache.flink.shaded.guava31.com.google.common.base.Predicates.not; import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/flink-formats/flink-csv/src/main/java/org/apache/flink/formats/csv/CsvRowDataSerializationSchema.java b/flink-formats/flink-csv/src/main/java/org/apache/flink/formats/csv/CsvRowDataSerializationSchema.java index 6c5d620f58c9c..737b74eda20f6 100644 --- a/flink-formats/flink-csv/src/main/java/org/apache/flink/formats/csv/CsvRowDataSerializationSchema.java +++ b/flink-formats/flink-csv/src/main/java/org/apache/flink/formats/csv/CsvRowDataSerializationSchema.java @@ -26,10 +26,9 @@ import org.apache.flink.util.function.SerializableSupplier; import org.apache.flink.util.jackson.JacksonMapperFactory; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.DeserializationFeature; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectWriter; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.cfg.JsonNodeFeature; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.dataformat.csv.CsvMapper; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.dataformat.csv.CsvSchema; @@ -37,8 +36,6 @@ import java.util.Arrays; import java.util.Objects; -import static org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN; - /** * Serialization schema that serializes an object of Flink Table & SQL internal data structure into * a CSV bytes. @@ -157,12 +154,9 @@ public CsvRowDataSerializationSchema build() { csvSchema, () -> { final CsvMapper csvMapper = JacksonMapperFactory.createCsvMapper(); - - csvMapper.configure(WRITE_BIGDECIMAL_AS_PLAIN, !isScientificNotation); - csvMapper.configure( - DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS, true); csvMapper.configure( - JsonNodeFeature.STRIP_TRAILING_BIGDECIMAL_ZEROES, false); + JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN, + !isScientificNotation); return csvMapper; }); } diff --git a/flink-formats/flink-csv/src/main/java/org/apache/flink/formats/csv/RowDataToCsvConverters.java b/flink-formats/flink-csv/src/main/java/org/apache/flink/formats/csv/RowDataToCsvConverters.java index 398e926a7fb53..8d689086558c3 100644 --- a/flink-formats/flink-csv/src/main/java/org/apache/flink/formats/csv/RowDataToCsvConverters.java +++ b/flink-formats/flink-csv/src/main/java/org/apache/flink/formats/csv/RowDataToCsvConverters.java @@ -38,7 +38,6 @@ import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.dataformat.csv.CsvMapper; import java.io.Serializable; -import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalTime; import java.time.format.DateTimeFormatter; @@ -48,7 +47,6 @@ import static java.time.format.DateTimeFormatter.ISO_LOCAL_TIME; import static org.apache.flink.formats.common.TimeFormats.SQL_TIMESTAMP_FORMAT; import static org.apache.flink.formats.common.TimeFormats.SQL_TIMESTAMP_WITH_LOCAL_TIMEZONE_FORMAT; -import static org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.StreamWriteFeature.WRITE_BIGDECIMAL_AS_PLAIN; /** Tool class used to convert from {@link RowData} to CSV-format {@link JsonNode}. * */ @Internal @@ -277,7 +275,7 @@ private static RowFieldConverter createDecimalRowFieldConverter(DecimalType deci final int scale = decimalType.getScale(); return (csvMapper, container, row, pos) -> { DecimalData decimal = row.getDecimal(pos, precision, scale); - return convertDecimal(csvMapper, decimal, container); + return convertDecimal(decimal, container); }; } @@ -287,17 +285,12 @@ private static ArrayElementConverter createDecimalArrayElementConverter( final int scale = decimalType.getScale(); return (csvMapper, container, array, pos) -> { DecimalData decimal = array.getDecimal(pos, precision, scale); - return convertDecimal(csvMapper, decimal, container); + return convertDecimal(decimal, container); }; } - private static JsonNode convertDecimal( - CsvMapper csvMapper, DecimalData decimal, ContainerNode container) { - BigDecimal bigDecimal = decimal.toBigDecimal(); - return container.numberNode( - csvMapper.isEnabled(WRITE_BIGDECIMAL_AS_PLAIN) - ? bigDecimal - : bigDecimal.stripTrailingZeros()); + private static JsonNode convertDecimal(DecimalData decimal, ContainerNode container) { + return container.numberNode(decimal.toBigDecimal()); } private static JsonNode convertDate(int days, ContainerNode container) { diff --git a/flink-formats/flink-csv/src/test/java/org/apache/flink/formats/csv/CsvFormatFactoryTest.java b/flink-formats/flink-csv/src/test/java/org/apache/flink/formats/csv/CsvFormatFactoryTest.java index 21974e14864bd..ba4941099cfb9 100644 --- a/flink-formats/flink-csv/src/test/java/org/apache/flink/formats/csv/CsvFormatFactoryTest.java +++ b/flink-formats/flink-csv/src/test/java/org/apache/flink/formats/csv/CsvFormatFactoryTest.java @@ -289,7 +289,7 @@ public void testSerializationWithNotWriteBigDecimalInScientificNotation() { GenericRowData.of( fromString("abc"), fromBigDecimal(new BigDecimal("100000"), 10, 3), false); byte[] bytes = runtimeEncoder.serialize(rowData); - assertThat(new String(bytes)).isEqualTo("abc;'100000.000';false"); + assertThat(new String(bytes)).isEqualTo("abc;'100000';false"); } @Test diff --git a/flink-formats/flink-json/src/main/java/org/apache/flink/formats/json/JsonRowDataSerializationSchema.java b/flink-formats/flink-json/src/main/java/org/apache/flink/formats/json/JsonRowDataSerializationSchema.java index d33007b774eaf..376d0d568a33d 100644 --- a/flink-formats/flink-json/src/main/java/org/apache/flink/formats/json/JsonRowDataSerializationSchema.java +++ b/flink-formats/flink-json/src/main/java/org/apache/flink/formats/json/JsonRowDataSerializationSchema.java @@ -26,9 +26,7 @@ import org.apache.flink.util.jackson.JacksonMapperFactory; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.DeserializationFeature; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.cfg.JsonNodeFeature; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ObjectNode; import java.util.Objects; @@ -92,9 +90,7 @@ public void open(InitializationContext context) throws Exception { JacksonMapperFactory.createObjectMapper() .configure( JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN, - encodeDecimalAsPlainNumber) - .configure(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS, true) - .configure(JsonNodeFeature.STRIP_TRAILING_BIGDECIMAL_ZEROES, false); + encodeDecimalAsPlainNumber); } @Override diff --git a/flink-formats/flink-json/src/main/java/org/apache/flink/formats/json/RowDataToJsonConverters.java b/flink-formats/flink-json/src/main/java/org/apache/flink/formats/json/RowDataToJsonConverters.java index 2725298b13aa1..2a1cd076ecf50 100644 --- a/flink-formats/flink-json/src/main/java/org/apache/flink/formats/json/RowDataToJsonConverters.java +++ b/flink-formats/flink-json/src/main/java/org/apache/flink/formats/json/RowDataToJsonConverters.java @@ -52,7 +52,6 @@ import static org.apache.flink.formats.common.TimeFormats.SQL_TIMESTAMP_FORMAT; import static org.apache.flink.formats.common.TimeFormats.SQL_TIMESTAMP_WITH_LOCAL_TIMEZONE_FORMAT; import static org.apache.flink.formats.common.TimeFormats.SQL_TIME_FORMAT; -import static org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.StreamWriteFeature.WRITE_BIGDECIMAL_AS_PLAIN; /** Tool class used to convert from {@link RowData} to {@link JsonNode}. * */ @Internal @@ -153,11 +152,7 @@ private RowDataToJsonConverter createNotNullConverter(LogicalType type) { private RowDataToJsonConverter createDecimalConverter() { return (mapper, reuse, value) -> { BigDecimal bd = ((DecimalData) value).toBigDecimal(); - return mapper.getNodeFactory() - .numberNode( - mapper.isEnabled(WRITE_BIGDECIMAL_AS_PLAIN) - ? bd - : bd.stripTrailingZeros()); + return mapper.getNodeFactory().numberNode(bd); }; } diff --git a/flink-formats/flink-protobuf/src/main/java/org/apache/flink/formats/protobuf/util/PbCodegenAppender.java b/flink-formats/flink-protobuf/src/main/java/org/apache/flink/formats/protobuf/util/PbCodegenAppender.java index 817e949e14d22..8bca33eb98a42 100644 --- a/flink-formats/flink-protobuf/src/main/java/org/apache/flink/formats/protobuf/util/PbCodegenAppender.java +++ b/flink-formats/flink-protobuf/src/main/java/org/apache/flink/formats/protobuf/util/PbCodegenAppender.java @@ -18,7 +18,7 @@ package org.apache.flink.formats.protobuf.util; -import org.apache.flink.shaded.guava32.com.google.common.base.Strings; +import org.apache.flink.shaded.guava31.com.google.common.base.Strings; /** Helper class which do code fragment concat. */ public class PbCodegenAppender { diff --git a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/FlinkConfMountDecorator.java b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/FlinkConfMountDecorator.java index 3c3ee9a5154b7..e0cd9788bf591 100644 --- a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/FlinkConfMountDecorator.java +++ b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/FlinkConfMountDecorator.java @@ -31,7 +31,7 @@ import org.apache.flink.kubernetes.kubeclient.parameters.AbstractKubernetesParameters; import org.apache.flink.kubernetes.utils.Constants; -import org.apache.flink.shaded.guava32.com.google.common.io.Files; +import org.apache.flink.shaded.guava31.com.google.common.io.Files; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ConfigMapBuilder; diff --git a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/KerberosMountDecorator.java b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/KerberosMountDecorator.java index 374eac70abf45..e23df1e3ebb4f 100644 --- a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/KerberosMountDecorator.java +++ b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/KerberosMountDecorator.java @@ -25,7 +25,7 @@ import org.apache.flink.runtime.security.SecurityConfiguration; import org.apache.flink.util.StringUtils; -import org.apache.flink.shaded.guava32.com.google.common.io.Files; +import org.apache.flink.shaded.guava31.com.google.common.io.Files; import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.api.model.ContainerBuilder; diff --git a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/PodTemplateMountDecorator.java b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/PodTemplateMountDecorator.java index a40395473528f..d31367d61b022 100644 --- a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/PodTemplateMountDecorator.java +++ b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/PodTemplateMountDecorator.java @@ -25,7 +25,7 @@ import org.apache.flink.util.FlinkRuntimeException; import org.apache.flink.util.function.FunctionUtils; -import org.apache.flink.shaded.guava32.com.google.common.io.Files; +import org.apache.flink.shaded.guava31.com.google.common.io.Files; import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.api.model.Container; diff --git a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/KubernetesTestUtils.java b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/KubernetesTestUtils.java index 531eacf6de0dd..6a9b5908edd39 100644 --- a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/KubernetesTestUtils.java +++ b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/KubernetesTestUtils.java @@ -24,7 +24,7 @@ import org.apache.flink.runtime.clusterframework.ContaineredTaskManagerParameters; import org.apache.flink.runtime.clusterframework.TaskExecutorProcessUtils; -import org.apache.flink.shaded.guava32.com.google.common.io.Files; +import org.apache.flink.shaded.guava31.com.google.common.io.Files; import java.io.File; import java.io.IOException; diff --git a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/resources/KubernetesSharedInformerITCase.java b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/resources/KubernetesSharedInformerITCase.java index 5e9d14d35f509..51cc6063731d0 100644 --- a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/resources/KubernetesSharedInformerITCase.java +++ b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/resources/KubernetesSharedInformerITCase.java @@ -28,7 +28,7 @@ import org.apache.flink.util.ExecutorUtils; import org.apache.flink.util.concurrent.ExecutorThreadFactory; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableMap; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap; import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import org.junit.jupiter.api.AfterEach; diff --git a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/SharedBuffer.java b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/SharedBuffer.java index b89af03e80935..6c97af51a3771 100644 --- a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/SharedBuffer.java +++ b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/SharedBuffer.java @@ -34,11 +34,11 @@ import org.apache.flink.runtime.state.VoidNamespaceSerializer; import org.apache.flink.util.WrappingRuntimeException; -import org.apache.flink.shaded.guava32.com.google.common.cache.Cache; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheBuilder; -import org.apache.flink.shaded.guava32.com.google.common.cache.RemovalCause; -import org.apache.flink.shaded.guava32.com.google.common.cache.RemovalListener; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.cache.Cache; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder; +import org.apache.flink.shaded.guava31.com.google.common.cache.RemovalCause; +import org.apache.flink.shaded.guava31.com.google.common.cache.RemovalListener; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/AfterMatchSkipITCase.java b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/AfterMatchSkipITCase.java index 99b87574fde90..5dcebb3ae0400 100644 --- a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/AfterMatchSkipITCase.java +++ b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/AfterMatchSkipITCase.java @@ -31,7 +31,7 @@ import org.apache.flink.util.FlinkRuntimeException; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/GreedyITCase.java b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/GreedyITCase.java index a73bd13184310..4ab0f7184c763 100644 --- a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/GreedyITCase.java +++ b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/GreedyITCase.java @@ -24,7 +24,7 @@ import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.Test; diff --git a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/GroupITCase.java b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/GroupITCase.java index e1ae0ae0dffcc..19d896a39deac 100644 --- a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/GroupITCase.java +++ b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/GroupITCase.java @@ -26,7 +26,7 @@ import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.Test; diff --git a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/IterativeConditionsITCase.java b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/IterativeConditionsITCase.java index 4f58dea12adb3..c21e4a9f00405 100644 --- a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/IterativeConditionsITCase.java +++ b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/IterativeConditionsITCase.java @@ -26,7 +26,7 @@ import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.Test; diff --git a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/NFAITCase.java b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/NFAITCase.java index d39c83e4e3230..6f9c2edb4f427 100644 --- a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/NFAITCase.java +++ b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/NFAITCase.java @@ -35,7 +35,7 @@ import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.After; import org.junit.Assert; diff --git a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/NotPatternITCase.java b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/NotPatternITCase.java index 14c092b1a521f..f7a11d0552508 100644 --- a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/NotPatternITCase.java +++ b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/NotPatternITCase.java @@ -28,7 +28,7 @@ import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.Test; diff --git a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/SameElementITCase.java b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/SameElementITCase.java index 97920c6f157e5..26aedce15125a 100644 --- a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/SameElementITCase.java +++ b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/SameElementITCase.java @@ -26,8 +26,8 @@ import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterators; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterators; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.Test; diff --git a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/TimesOrMoreITCase.java b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/TimesOrMoreITCase.java index eb8d1755111ee..66e9592f6d6fe 100644 --- a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/TimesOrMoreITCase.java +++ b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/TimesOrMoreITCase.java @@ -25,7 +25,7 @@ import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/TimesRangeITCase.java b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/TimesRangeITCase.java index 8160669242500..0541f1756e941 100644 --- a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/TimesRangeITCase.java +++ b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/TimesRangeITCase.java @@ -25,7 +25,7 @@ import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/UntilConditionITCase.java b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/UntilConditionITCase.java index ca22f649060cd..6f8ee4e691062 100644 --- a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/UntilConditionITCase.java +++ b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/UntilConditionITCase.java @@ -25,7 +25,7 @@ import org.apache.flink.cep.utils.NFATestHarness; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.Test; diff --git a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/compiler/NFACompilerTest.java b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/compiler/NFACompilerTest.java index 48df91835de09..2ad78a7ec8210 100644 --- a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/compiler/NFACompilerTest.java +++ b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/compiler/NFACompilerTest.java @@ -33,7 +33,7 @@ import org.apache.flink.streaming.api.windowing.time.Time; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.Sets; +import org.apache.flink.shaded.guava31.com.google.common.collect.Sets; import org.junit.Rule; import org.junit.Test; diff --git a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/operator/CEPOperatorTest.java b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/operator/CEPOperatorTest.java index c817181a339f6..3424d2e3cdcb3 100644 --- a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/operator/CEPOperatorTest.java +++ b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/operator/CEPOperatorTest.java @@ -52,7 +52,7 @@ import org.apache.flink.util.TernaryBoolean; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.After; import org.junit.Assert; diff --git a/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/runtime/OperatorIDGenerator.java b/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/runtime/OperatorIDGenerator.java index 63a7a7aadb508..48f9e2425dcd3 100644 --- a/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/runtime/OperatorIDGenerator.java +++ b/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/runtime/OperatorIDGenerator.java @@ -22,7 +22,7 @@ import org.apache.flink.runtime.jobgraph.OperatorID; import org.apache.flink.streaming.api.graph.StreamGraph; -import org.apache.flink.shaded.guava32.com.google.common.hash.Hashing; +import org.apache.flink.shaded.guava31.com.google.common.hash.Hashing; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SingleInputNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SingleInputNode.java index 3cf58463cee35..f2626975121f4 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SingleInputNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SingleInputNode.java @@ -43,7 +43,7 @@ import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.util.Visitor; -import org.apache.flink.shaded.guava32.com.google.common.collect.Sets; +import org.apache.flink.shaded.guava31.com.google.common.collect.Sets; import java.util.ArrayList; import java.util.Collections; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TwoInputNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TwoInputNode.java index 6cf187a88989b..88be2be6795b0 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TwoInputNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TwoInputNode.java @@ -46,7 +46,7 @@ import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.util.Visitor; -import org.apache.flink.shaded.guava32.com.google.common.collect.Sets; +import org.apache.flink.shaded.guava31.com.google.common.collect.Sets; import java.util.ArrayList; import java.util.Collections; 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 4f83c85ee8004..cfd8c19c207dd 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 @@ -31,7 +31,7 @@ import org.apache.flink.util.Preconditions; import org.apache.flink.util.StringUtils; -import org.apache.flink.shaded.guava32.com.google.common.base.Strings; +import org.apache.flink.shaded.guava31.com.google.common.base.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-python/src/main/java/org/apache/flink/client/python/PythonFunctionFactory.java b/flink-python/src/main/java/org/apache/flink/client/python/PythonFunctionFactory.java index 5634a2880c2e5..0270f1f04aa3e 100644 --- a/flink-python/src/main/java/org/apache/flink/client/python/PythonFunctionFactory.java +++ b/flink-python/src/main/java/org/apache/flink/client/python/PythonFunctionFactory.java @@ -27,10 +27,10 @@ import org.apache.flink.util.FileUtils; import org.apache.flink.util.concurrent.ExecutorThreadFactory; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheBuilder; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheLoader; -import org.apache.flink.shaded.guava32.com.google.common.cache.LoadingCache; -import org.apache.flink.shaded.guava32.com.google.common.cache.RemovalListener; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheLoader; +import org.apache.flink.shaded.guava31.com.google.common.cache.LoadingCache; +import org.apache.flink.shaded.guava31.com.google.common.cache.RemovalListener; import py4j.GatewayServer; diff --git a/flink-python/src/main/java/org/apache/flink/python/chain/PythonOperatorChainingOptimizer.java b/flink-python/src/main/java/org/apache/flink/python/chain/PythonOperatorChainingOptimizer.java index dd2edb1d1c30f..4ff7829039cbb 100644 --- a/flink-python/src/main/java/org/apache/flink/python/chain/PythonOperatorChainingOptimizer.java +++ b/flink-python/src/main/java/org/apache/flink/python/chain/PythonOperatorChainingOptimizer.java @@ -60,9 +60,9 @@ import org.apache.flink.streaming.api.transformations.python.PythonKeyedBroadcastStateTransformation; import org.apache.flink.streaming.runtime.partitioner.ForwardPartitioner; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; -import org.apache.flink.shaded.guava32.com.google.common.collect.Queues; -import org.apache.flink.shaded.guava32.com.google.common.collect.Sets; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Queues; +import org.apache.flink.shaded.guava31.com.google.common.collect.Sets; import java.lang.reflect.Field; import java.util.ArrayList; 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 acafb5a876cac..cfe39175d8bc4 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 @@ -29,7 +29,7 @@ import org.apache.flink.util.ShutdownHookUtil; import org.apache.flink.util.function.FunctionWithException; -import org.apache.flink.shaded.guava32.com.google.common.base.Strings; +import org.apache.flink.shaded.guava31.com.google.common.base.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-python/src/main/java/org/apache/flink/python/util/PythonConfigUtil.java b/flink-python/src/main/java/org/apache/flink/python/util/PythonConfigUtil.java index e7f8543fd8366..b49b60c548686 100644 --- a/flink-python/src/main/java/org/apache/flink/python/util/PythonConfigUtil.java +++ b/flink-python/src/main/java/org/apache/flink/python/util/PythonConfigUtil.java @@ -52,9 +52,9 @@ import org.apache.flink.streaming.runtime.translators.python.PythonKeyedBroadcastStateTransformationTranslator; import org.apache.flink.util.OutputTag; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; -import org.apache.flink.shaded.guava32.com.google.common.collect.Queues; -import org.apache.flink.shaded.guava32.com.google.common.collect.Sets; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Queues; +import org.apache.flink.shaded.guava31.com.google.common.collect.Sets; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/flink-python/src/main/java/org/apache/flink/streaming/api/utils/PythonTypeUtils.java b/flink-python/src/main/java/org/apache/flink/streaming/api/utils/PythonTypeUtils.java index d01dab2296fee..7ee63382c1c63 100644 --- a/flink-python/src/main/java/org/apache/flink/streaming/api/utils/PythonTypeUtils.java +++ b/flink-python/src/main/java/org/apache/flink/streaming/api/utils/PythonTypeUtils.java @@ -92,7 +92,7 @@ import org.apache.flink.types.RowKind; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava32.com.google.common.collect.Sets; +import org.apache.flink.shaded.guava31.com.google.common.collect.Sets; import javax.annotation.Nullable; diff --git a/flink-python/src/main/java/org/apache/flink/table/runtime/arrow/ArrowUtils.java b/flink-python/src/main/java/org/apache/flink/table/runtime/arrow/ArrowUtils.java index a0461a917d5e7..6b71ceaef0e6d 100644 --- a/flink-python/src/main/java/org/apache/flink/table/runtime/arrow/ArrowUtils.java +++ b/flink-python/src/main/java/org/apache/flink/table/runtime/arrow/ArrowUtils.java @@ -99,7 +99,7 @@ import org.apache.flink.types.RowKind; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava32.com.google.common.collect.LinkedHashMultiset; +import org.apache.flink.shaded.guava31.com.google.common.collect.LinkedHashMultiset; import org.apache.arrow.flatbuf.MessageHeader; import org.apache.arrow.memory.BufferAllocator; diff --git a/flink-python/src/test/java/org/apache/flink/table/runtime/arrow/ArrowUtilsTest.java b/flink-python/src/test/java/org/apache/flink/table/runtime/arrow/ArrowUtilsTest.java index 38666d2b2d70e..553c908f8b934 100644 --- a/flink-python/src/test/java/org/apache/flink/table/runtime/arrow/ArrowUtilsTest.java +++ b/flink-python/src/test/java/org/apache/flink/table/runtime/arrow/ArrowUtilsTest.java @@ -71,7 +71,7 @@ import org.apache.flink.table.types.logical.VarBinaryType; import org.apache.flink.table.types.logical.VarCharType; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.VectorSchemaRoot; diff --git a/flink-python/src/test/java/org/apache/flink/table/runtime/arrow/sources/ArrowSourceFunctionTestBase.java b/flink-python/src/test/java/org/apache/flink/table/runtime/arrow/sources/ArrowSourceFunctionTestBase.java index 67654a6eb060c..d76e785eb9905 100644 --- a/flink-python/src/test/java/org/apache/flink/table/runtime/arrow/sources/ArrowSourceFunctionTestBase.java +++ b/flink-python/src/test/java/org/apache/flink/table/runtime/arrow/sources/ArrowSourceFunctionTestBase.java @@ -35,7 +35,7 @@ import org.apache.flink.testutils.DeeplyEqualsChecker; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.apache.arrow.vector.VectorSchemaRoot; import org.apache.arrow.vector.ipc.ArrowStreamWriter; diff --git a/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/network/AbstractServerBase.java b/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/network/AbstractServerBase.java index b84997d5973e7..abd447457a469 100644 --- a/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/network/AbstractServerBase.java +++ b/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/network/AbstractServerBase.java @@ -25,7 +25,7 @@ import org.apache.flink.util.FlinkRuntimeException; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava32.com.google.common.util.concurrent.ThreadFactoryBuilder; +import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.ThreadFactoryBuilder; import org.apache.flink.shaded.netty4.io.netty.bootstrap.ServerBootstrap; import org.apache.flink.shaded.netty4.io.netty.channel.ChannelFuture; import org.apache.flink.shaded.netty4.io.netty.channel.ChannelInitializer; diff --git a/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/network/Client.java b/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/network/Client.java index d859cb828505b..d57332def045b 100644 --- a/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/network/Client.java +++ b/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/network/Client.java @@ -26,7 +26,7 @@ import org.apache.flink.util.Preconditions; import org.apache.flink.util.concurrent.FutureUtils; -import org.apache.flink.shaded.guava32.com.google.common.util.concurrent.ThreadFactoryBuilder; +import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.ThreadFactoryBuilder; import org.apache.flink.shaded.netty4.io.netty.bootstrap.Bootstrap; import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBufAllocator; import org.apache.flink.shaded.netty4.io.netty.channel.ChannelFutureListener; diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarRunHandler.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarRunHandler.java index 7be262589734b..7c03432c40d62 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarRunHandler.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarRunHandler.java @@ -51,7 +51,7 @@ import static java.util.Objects.requireNonNull; import static org.apache.flink.runtime.rest.handler.util.HandlerRequestUtils.fromRequestBodyOrQueryParameter; import static org.apache.flink.runtime.rest.handler.util.HandlerRequestUtils.getQueryParameter; -import static org.apache.flink.shaded.guava32.com.google.common.base.Strings.emptyToNull; +import static org.apache.flink.shaded.guava31.com.google.common.base.Strings.emptyToNull; /** Handler to submit jobs uploaded via the Web UI. */ public class JarRunHandler diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/utils/JarHandlerUtils.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/utils/JarHandlerUtils.java index 89dc26f86912b..c5e0f492c96c2 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/utils/JarHandlerUtils.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/utils/JarHandlerUtils.java @@ -58,7 +58,7 @@ import static org.apache.flink.runtime.rest.handler.util.HandlerRequestUtils.fromRequestBodyOrQueryParameter; import static org.apache.flink.runtime.rest.handler.util.HandlerRequestUtils.getQueryParameter; -import static org.apache.flink.shaded.guava32.com.google.common.base.Strings.emptyToNull; +import static org.apache.flink.shaded.guava31.com.google.common.base.Strings.emptyToNull; import static org.apache.flink.util.Preconditions.checkNotNull; /** diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java index 533c91feef750..318309c1ad609 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java @@ -23,7 +23,7 @@ import org.apache.flink.core.fs.FileSystem; import org.apache.flink.core.fs.Path; -import org.apache.flink.shaded.guava32.com.google.common.io.Files; +import org.apache.flink.shaded.guava31.com.google.common.io.Files; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/TaskStateSnapshot.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/TaskStateSnapshot.java index 35d45ae886a48..ad0b9cfcc2757 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/TaskStateSnapshot.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/TaskStateSnapshot.java @@ -28,7 +28,7 @@ import org.apache.flink.util.Preconditions; import org.apache.flink.util.SerializedValue; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterators; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterators; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/ApplicationStatus.java b/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/ApplicationStatus.java index 6d9f708ab0f6a..64f864704aa30 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/ApplicationStatus.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/ApplicationStatus.java @@ -20,8 +20,8 @@ import org.apache.flink.api.common.JobStatus; -import org.apache.flink.shaded.guava32.com.google.common.collect.BiMap; -import org.apache.flink.shaded.guava32.com.google.common.collect.EnumBiMap; +import org.apache.flink.shaded.guava31.com.google.common.collect.BiMap; +import org.apache.flink.shaded.guava31.com.google.common.collect.EnumBiMap; /** The status of an application. */ public enum ApplicationStatus { diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/BootstrapTools.java b/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/BootstrapTools.java index a33bf835a49be..90148681a875c 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/BootstrapTools.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/BootstrapTools.java @@ -27,8 +27,8 @@ import org.apache.flink.runtime.entrypoint.parser.CommandLineOptions; import org.apache.flink.util.OperatingSystem; -import org.apache.flink.shaded.guava32.com.google.common.escape.Escaper; -import org.apache.flink.shaded.guava32.com.google.common.escape.Escapers; +import org.apache.flink.shaded.guava31.com.google.common.escape.Escaper; +import org.apache.flink.shaded.guava31.com.google.common.escape.Escapers; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/ConfigurationNotAllowedMessage.java b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/ConfigurationNotAllowedMessage.java index faf43de2aa1f0..41aab5d755d4b 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/ConfigurationNotAllowedMessage.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/ConfigurationNotAllowedMessage.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.configuration.DeploymentOptions; -import org.apache.flink.shaded.guava32.com.google.common.collect.MapDifference.ValueDifference; +import org.apache.flink.shaded.guava31.com.google.common.collect.MapDifference.ValueDifference; /** * If {@link DeploymentOptions#PROGRAM_CONFIG_ENABLED} is disabled, this error denotes the not diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/FileExecutionGraphInfoStore.java b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/FileExecutionGraphInfoStore.java index a82dad83c4951..15423bb36ee45 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/FileExecutionGraphInfoStore.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/FileExecutionGraphInfoStore.java @@ -32,12 +32,12 @@ import org.apache.flink.util.ShutdownHookUtil; import org.apache.flink.util.concurrent.ScheduledExecutor; -import org.apache.flink.shaded.guava32.com.google.common.base.Ticker; -import org.apache.flink.shaded.guava32.com.google.common.cache.Cache; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheBuilder; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheLoader; -import org.apache.flink.shaded.guava32.com.google.common.cache.LoadingCache; -import org.apache.flink.shaded.guava32.com.google.common.cache.RemovalListener; +import org.apache.flink.shaded.guava31.com.google.common.base.Ticker; +import org.apache.flink.shaded.guava31.com.google.common.cache.Cache; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheLoader; +import org.apache.flink.shaded.guava31.com.google.common.cache.LoadingCache; +import org.apache.flink.shaded.guava31.com.google.common.cache.RemovalListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/JobDispatcherFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/JobDispatcherFactory.java index 4b3f613980c43..7c9b177512c6d 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/JobDispatcherFactory.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/JobDispatcherFactory.java @@ -26,7 +26,7 @@ import org.apache.flink.runtime.rpc.RpcService; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import java.util.Collection; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/MemoryExecutionGraphInfoStore.java b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/MemoryExecutionGraphInfoStore.java index f6abd7283ab1a..469c0c11ea22c 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/MemoryExecutionGraphInfoStore.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/MemoryExecutionGraphInfoStore.java @@ -28,9 +28,9 @@ import org.apache.flink.util.ShutdownHookUtil; import org.apache.flink.util.concurrent.ScheduledExecutor; -import org.apache.flink.shaded.guava32.com.google.common.base.Ticker; -import org.apache.flink.shaded.guava32.com.google.common.cache.Cache; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheBuilder; +import org.apache.flink.shaded.guava31.com.google.common.base.Ticker; +import org.apache.flink.shaded.guava31.com.google.common.cache.Cache; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/SessionClusterEntrypoint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/SessionClusterEntrypoint.java index 9f614c36c3fed..b0877ba94a410 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/SessionClusterEntrypoint.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/SessionClusterEntrypoint.java @@ -27,7 +27,7 @@ import org.apache.flink.runtime.dispatcher.MemoryExecutionGraphInfoStore; import org.apache.flink.util.concurrent.ScheduledExecutor; -import org.apache.flink.shaded.guava32.com.google.common.base.Ticker; +import org.apache.flink.shaded.guava31.com.google.common.base.Ticker; import java.io.File; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/JobInformation.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/JobInformation.java index a1c8ee5780fbe..5792caa271153 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/JobInformation.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/JobInformation.java @@ -26,8 +26,8 @@ import org.apache.flink.util.Preconditions; import org.apache.flink.util.SerializedValue; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableCollection; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableCollection; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; import java.io.Serializable; import java.net.URL; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/TaskEventHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/TaskEventHandler.java index f58ccbcd84518..5fb2cb4217219 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/TaskEventHandler.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/TaskEventHandler.java @@ -21,8 +21,8 @@ import org.apache.flink.runtime.event.TaskEvent; import org.apache.flink.runtime.util.event.EventListener; -import org.apache.flink.shaded.guava32.com.google.common.collect.HashMultimap; -import org.apache.flink.shaded.guava32.com.google.common.collect.Multimap; +import org.apache.flink.shaded.guava31.com.google.common.collect.HashMultimap; +import org.apache.flink.shaded.guava31.com.google.common.collect.Multimap; /** * The event handler manages {@link EventListener} instances and allows to publish events to them. diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyServer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyServer.java index be387d2ad5bb1..92ac2defcf17c 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyServer.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyServer.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.util.FatalExitExceptionHandler; -import org.apache.flink.shaded.guava32.com.google.common.util.concurrent.ThreadFactoryBuilder; +import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.ThreadFactoryBuilder; import org.apache.flink.shaded.netty4.io.netty.bootstrap.ServerBootstrap; import org.apache.flink.shaded.netty4.io.netty.channel.ChannelFuture; import org.apache.flink.shaded.netty4.io.netty.channel.ChannelInitializer; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/PipelinedSubpartition.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/PipelinedSubpartition.java index d3e4caf42bab4..1fb8994739358 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/PipelinedSubpartition.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/PipelinedSubpartition.java @@ -30,7 +30,7 @@ import org.apache.flink.runtime.io.network.buffer.BufferConsumerWithPartialRecordLength; import org.apache.flink.runtime.io.network.logger.NetworkActionsLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterators; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterators; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/UnionResultSubpartitionView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/UnionResultSubpartitionView.java index db65a2150519f..c1a38e741ebeb 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/UnionResultSubpartitionView.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/UnionResultSubpartitionView.java @@ -21,8 +21,8 @@ import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.io.network.buffer.Buffer; -import org.apache.flink.shaded.guava32.com.google.common.collect.BiMap; -import org.apache.flink.shaded.guava32.com.google.common.collect.HashBiMap; +import org.apache.flink.shaded.guava31.com.google.common.collect.BiMap; +import org.apache.flink.shaded.guava31.com.google.common.collect.HashBiMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/RemoteInputChannel.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/RemoteInputChannel.java index 976ba5a5fd9b8..e41d209b4eaa4 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/RemoteInputChannel.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/RemoteInputChannel.java @@ -47,7 +47,7 @@ import org.apache.flink.runtime.io.network.partition.ResultSubpartitionIndexSet; import org.apache.flink.util.ExceptionUtils; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterators; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterators; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/UnionInputGate.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/UnionInputGate.java index 629e2610e7231..51f40fa3f3fff 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/UnionInputGate.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/UnionInputGate.java @@ -24,7 +24,7 @@ import org.apache.flink.runtime.io.network.api.EndOfPartitionEvent; import org.apache.flink.runtime.io.network.partition.PrioritizedDeque; -import org.apache.flink.shaded.guava32.com.google.common.collect.Sets; +import org.apache.flink.shaded.guava31.com.google.common.collect.Sets; import java.io.IOException; import java.util.Arrays; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/HsMemoryDataSpiller.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/HsMemoryDataSpiller.java index cff346d06cb6e..4935e48294d95 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/HsMemoryDataSpiller.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/HsMemoryDataSpiller.java @@ -24,7 +24,7 @@ import org.apache.flink.util.ExceptionUtils; import org.apache.flink.util.FatalExitExceptionHandler; -import org.apache.flink.shaded.guava32.com.google.common.util.concurrent.ThreadFactoryBuilder; +import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.ThreadFactoryBuilder; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/HsSpillingStrategyUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/HsSpillingStrategyUtils.java index 4a0b943bd1b59..5e3786daf0c9e 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/HsSpillingStrategyUtils.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/HsSpillingStrategyUtils.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.io.network.partition.hybrid; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterators; -import org.apache.flink.shaded.guava32.com.google.common.collect.PeekingIterator; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterators; +import org.apache.flink.shaded.guava31.com.google.common.collect.PeekingIterator; import java.util.ArrayList; import java.util.Collections; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/index/FileDataIndexCache.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/index/FileDataIndexCache.java index 14cc12549d5a1..24029da69a05d 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/index/FileDataIndexCache.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/index/FileDataIndexCache.java @@ -21,9 +21,9 @@ import org.apache.flink.util.ExceptionUtils; import org.apache.flink.util.IOUtils; -import org.apache.flink.shaded.guava32.com.google.common.cache.Cache; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheBuilder; -import org.apache.flink.shaded.guava32.com.google.common.cache.RemovalNotification; +import org.apache.flink.shaded.guava31.com.google.common.cache.Cache; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder; +import org.apache.flink.shaded.guava31.com.google.common.cache.RemovalNotification; import java.io.IOException; import java.nio.file.Path; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/tiered/file/ProducerMergedPartitionFileWriter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/tiered/file/ProducerMergedPartitionFileWriter.java index 60fe6c659b3c3..57ce19eb2c610 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/tiered/file/ProducerMergedPartitionFileWriter.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/tiered/file/ProducerMergedPartitionFileWriter.java @@ -25,7 +25,7 @@ import org.apache.flink.util.ExceptionUtils; import org.apache.flink.util.FatalExitExceptionHandler; -import org.apache.flink.shaded.guava32.com.google.common.util.concurrent.ThreadFactoryBuilder; +import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.ThreadFactoryBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/tiered/file/SegmentPartitionFileWriter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/tiered/file/SegmentPartitionFileWriter.java index 2d2744be0b80d..24fe59bfaefe5 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/tiered/file/SegmentPartitionFileWriter.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/tiered/file/SegmentPartitionFileWriter.java @@ -28,7 +28,7 @@ import org.apache.flink.util.FatalExitExceptionHandler; import org.apache.flink.util.concurrent.FutureUtils; -import org.apache.flink.shaded.guava32.com.google.common.util.concurrent.ThreadFactoryBuilder; +import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.ThreadFactoryBuilder; import java.io.IOException; import java.nio.channels.Channels; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/tiered/storage/TieredStorageMemoryManagerImpl.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/tiered/storage/TieredStorageMemoryManagerImpl.java index afef86247b07a..bf5081e0721eb 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/tiered/storage/TieredStorageMemoryManagerImpl.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/tiered/storage/TieredStorageMemoryManagerImpl.java @@ -28,7 +28,7 @@ import org.apache.flink.util.ExceptionUtils; import org.apache.flink.util.FatalExitExceptionHandler; -import org.apache.flink.shaded.guava32.com.google.common.util.concurrent.ThreadFactoryBuilder; +import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.ThreadFactoryBuilder; import javax.annotation.Nullable; import javax.annotation.concurrent.GuardedBy; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/ReporterSetup.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/ReporterSetup.java index 20169017430df..be2db174d8387 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/ReporterSetup.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/ReporterSetup.java @@ -33,7 +33,7 @@ import org.apache.flink.traces.reporter.TraceReporterFactory; import org.apache.flink.util.CollectionUtil; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterators; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterators; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/AbstractHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/AbstractHandler.java index fc37732c888a7..55929e7eaeac2 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/AbstractHandler.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/AbstractHandler.java @@ -37,7 +37,7 @@ import org.apache.flink.util.Preconditions; import org.apache.flink.util.concurrent.FutureUtils; -import org.apache.flink.shaded.guava32.com.google.common.base.Ascii; +import org.apache.flink.shaded.guava31.com.google.common.base.Ascii; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonParseException; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonMappingException; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/async/CompletedOperationCache.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/async/CompletedOperationCache.java index c1637c918ddc8..7130318cd33c8 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/async/CompletedOperationCache.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/async/CompletedOperationCache.java @@ -24,10 +24,10 @@ import org.apache.flink.util.Preconditions; import org.apache.flink.util.concurrent.FutureUtils; -import org.apache.flink.shaded.guava32.com.google.common.base.Ticker; -import org.apache.flink.shaded.guava32.com.google.common.cache.Cache; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheBuilder; -import org.apache.flink.shaded.guava32.com.google.common.cache.RemovalListener; +import org.apache.flink.shaded.guava31.com.google.common.base.Ticker; +import org.apache.flink.shaded.guava31.com.google.common.cache.Cache; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder; +import org.apache.flink.shaded.guava31.com.google.common.cache.RemovalListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/AbstractCheckpointHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/AbstractCheckpointHandler.java index 9b6aa285881bb..b8f86a9f88520 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/AbstractCheckpointHandler.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/AbstractCheckpointHandler.java @@ -34,7 +34,7 @@ import org.apache.flink.runtime.webmonitor.retriever.GatewayRetriever; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava32.com.google.common.cache.Cache; +import org.apache.flink.shaded.guava31.com.google.common.cache.Cache; import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpResponseStatus; import java.util.Map; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/AbstractCheckpointStatsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/AbstractCheckpointStatsHandler.java index 653a1f8abebc1..60d009133f5f6 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/AbstractCheckpointStatsHandler.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/AbstractCheckpointStatsHandler.java @@ -36,7 +36,7 @@ import org.apache.flink.runtime.webmonitor.retriever.GatewayRetriever; import org.apache.flink.util.ExceptionUtils; -import org.apache.flink.shaded.guava32.com.google.common.cache.Cache; +import org.apache.flink.shaded.guava31.com.google.common.cache.Cache; import javax.annotation.Nonnull; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointStatisticDetailsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointStatisticDetailsHandler.java index d15b2d5a02b76..ac41bc71fe3f7 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointStatisticDetailsHandler.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointStatisticDetailsHandler.java @@ -37,7 +37,7 @@ import org.apache.flink.runtime.webmonitor.history.OnlyExecutionGraphJsonArchivist; import org.apache.flink.runtime.webmonitor.retriever.GatewayRetriever; -import org.apache.flink.shaded.guava32.com.google.common.cache.Cache; +import org.apache.flink.shaded.guava31.com.google.common.cache.Cache; import java.io.IOException; import java.util.ArrayList; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointStatsCache.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointStatsCache.java index 5966ec232d2a1..290a65ae12969 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointStatsCache.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointStatsCache.java @@ -20,8 +20,8 @@ import org.apache.flink.runtime.checkpoint.AbstractCheckpointStats; -import org.apache.flink.shaded.guava32.com.google.common.cache.Cache; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheBuilder; +import org.apache.flink.shaded.guava31.com.google.common.cache.Cache; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder; import javax.annotation.Nullable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointingStatisticsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointingStatisticsHandler.java index 1a2b370069347..6accdd409834d 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointingStatisticsHandler.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointingStatisticsHandler.java @@ -43,7 +43,7 @@ import org.apache.flink.runtime.webmonitor.history.OnlyExecutionGraphJsonArchivist; import org.apache.flink.runtime.webmonitor.retriever.GatewayRetriever; -import org.apache.flink.shaded.guava32.com.google.common.cache.Cache; +import org.apache.flink.shaded.guava31.com.google.common.cache.Cache; import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpResponseStatus; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/TaskCheckpointStatisticDetailsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/TaskCheckpointStatisticDetailsHandler.java index 29768faf4692f..1f0b7e5ed1eb5 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/TaskCheckpointStatisticDetailsHandler.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/TaskCheckpointStatisticDetailsHandler.java @@ -46,7 +46,7 @@ import org.apache.flink.runtime.webmonitor.history.OnlyExecutionGraphJsonArchivist; import org.apache.flink.runtime.webmonitor.retriever.GatewayRetriever; -import org.apache.flink.shaded.guava32.com.google.common.cache.Cache; +import org.apache.flink.shaded.guava31.com.google.common.cache.Cache; import java.io.IOException; import java.util.ArrayList; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/AbstractTaskManagerFileHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/AbstractTaskManagerFileHandler.java index ca4a68cc18272..5c91a54cad213 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/AbstractTaskManagerFileHandler.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/AbstractTaskManagerFileHandler.java @@ -41,10 +41,10 @@ import org.apache.flink.util.FlinkException; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheBuilder; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheLoader; -import org.apache.flink.shaded.guava32.com.google.common.cache.LoadingCache; -import org.apache.flink.shaded.guava32.com.google.common.cache.RemovalNotification; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheLoader; +import org.apache.flink.shaded.guava31.com.google.common.cache.LoadingCache; +import org.apache.flink.shaded.guava31.com.google.common.cache.RemovalNotification; import org.apache.flink.shaded.netty4.io.netty.channel.ChannelHandlerContext; import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpRequest; import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpResponseStatus; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/adaptive/JobGraphJobInformation.java b/flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/adaptive/JobGraphJobInformation.java index 56b5bf92c8949..4ef5d84d390dc 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/adaptive/JobGraphJobInformation.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/adaptive/JobGraphJobInformation.java @@ -28,7 +28,7 @@ import org.apache.flink.runtime.scheduler.adaptive.allocator.JobInformation; import org.apache.flink.util.InstantiationUtil; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import java.util.Collection; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/source/coordinator/SourceCoordinatorContext.java b/flink-runtime/src/main/java/org/apache/flink/runtime/source/coordinator/SourceCoordinatorContext.java index ced3d93df0fd2..fa764389797b7 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/source/coordinator/SourceCoordinatorContext.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/source/coordinator/SourceCoordinatorContext.java @@ -45,7 +45,7 @@ Licensed to the Apache Software Foundation (ASF) under one import org.apache.flink.util.ThrowableCatchingRunnable; import org.apache.flink.util.concurrent.ExecutorThreadFactory; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateUtil.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateUtil.java index 595c3ce36e774..70aae3ee774dc 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateUtil.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateUtil.java @@ -21,7 +21,7 @@ import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.util.LambdaUtil; -import org.apache.flink.shaded.guava32.com.google.common.base.Joiner; +import org.apache.flink.shaded.guava31.com.google.common.base.Joiner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/changelog/StateChangelogStorageLoader.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/changelog/StateChangelogStorageLoader.java index c9eded050bff1..ece421c491ea0 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/changelog/StateChangelogStorageLoader.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/changelog/StateChangelogStorageLoader.java @@ -37,7 +37,7 @@ import java.util.Iterator; import java.util.ServiceLoader; -import static org.apache.flink.shaded.guava32.com.google.common.collect.Iterators.concat; +import static org.apache.flink.shaded.guava31.com.google.common.collect.Iterators.concat; /** A thin wrapper around {@link PluginManager} to load {@link StateChangelogStorage}. */ @Internal diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java index 8ac63f602af23..e75714425a237 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java @@ -149,8 +149,8 @@ import org.apache.flink.util.concurrent.ExecutorThreadFactory; import org.apache.flink.util.concurrent.FutureUtils; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; -import org.apache.flink.shaded.guava32.com.google.common.collect.Sets; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.Sets; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutorMemoryConfiguration.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutorMemoryConfiguration.java index 43d98db507829..dd9c7c9a2ca29 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutorMemoryConfiguration.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutorMemoryConfiguration.java @@ -22,7 +22,7 @@ import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.MemorySize; -import org.apache.flink.shaded.guava32.com.google.common.base.MoreObjects; +import org.apache.flink.shaded.guava31.com.google.common.base.MoreObjects; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonInclude; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/util/DefaultGroupCache.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/DefaultGroupCache.java index f26f9fa04da0c..e424e0521b69e 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/util/DefaultGroupCache.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/util/DefaultGroupCache.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.shaded.guava32.com.google.common.base.Ticker; -import org.apache.flink.shaded.guava32.com.google.common.cache.Cache; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheBuilder; -import org.apache.flink.shaded.guava32.com.google.common.cache.RemovalNotification; +import org.apache.flink.shaded.guava31.com.google.common.base.Ticker; +import org.apache.flink.shaded.guava31.com.google.common.cache.Cache; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder; +import org.apache.flink.shaded.guava31.com.google.common.cache.RemovalNotification; import javax.annotation.concurrent.NotThreadSafe; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/util/config/memory/ManagedMemoryUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/config/memory/ManagedMemoryUtils.java index 801d5e540f45b..56041d7f30cf2 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/util/config/memory/ManagedMemoryUtils.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/util/config/memory/ManagedMemoryUtils.java @@ -25,8 +25,8 @@ import org.apache.flink.core.memory.ManagedMemoryUseCase; import org.apache.flink.runtime.state.StateBackendLoader; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableMap; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorEndpoint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorEndpoint.java index e1d6c16778cc1..ae491742573e4 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorEndpoint.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorEndpoint.java @@ -177,8 +177,8 @@ import org.apache.flink.util.concurrent.ExecutorThreadFactory; import org.apache.flink.util.concurrent.FutureUtils; -import org.apache.flink.shaded.guava32.com.google.common.cache.Cache; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheBuilder; +import org.apache.flink.shaded.guava31.com.google.common.cache.Cache; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder; import org.apache.flink.shaded.netty4.io.netty.channel.ChannelInboundHandler; import javax.annotation.Nullable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/stats/TaskStatsRequestCoordinator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/stats/TaskStatsRequestCoordinator.java index b655764b81d13..438255a6dd45a 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/stats/TaskStatsRequestCoordinator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/stats/TaskStatsRequestCoordinator.java @@ -21,8 +21,8 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.runtime.executiongraph.ExecutionAttemptID; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableSet; -import org.apache.flink.shaded.guava32.com.google.common.collect.Maps; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableSet; +import org.apache.flink.shaded.guava31.com.google.common.collect.Maps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/threadinfo/ThreadInfoRequestCoordinator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/threadinfo/ThreadInfoRequestCoordinator.java index c63ea2bea7f16..c6896899ad349 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/threadinfo/ThreadInfoRequestCoordinator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/threadinfo/ThreadInfoRequestCoordinator.java @@ -26,7 +26,7 @@ import org.apache.flink.runtime.webmonitor.stats.TaskStatsRequestCoordinator; import org.apache.flink.util.concurrent.FutureUtils; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableSet; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableSet; import java.time.Duration; import java.util.Collection; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/threadinfo/VertexThreadInfoTracker.java b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/threadinfo/VertexThreadInfoTracker.java index db7d3a6bea6e9..a0ac5d4f423ad 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/threadinfo/VertexThreadInfoTracker.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/threadinfo/VertexThreadInfoTracker.java @@ -35,8 +35,8 @@ import org.apache.flink.runtime.webmonitor.retriever.GatewayRetriever; import org.apache.flink.runtime.webmonitor.stats.VertexStatsTracker; -import org.apache.flink.shaded.guava32.com.google.common.cache.Cache; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableSet; +import org.apache.flink.shaded.guava31.com.google.common.cache.Cache; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/threadinfo/VertexThreadInfoTrackerBuilder.java b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/threadinfo/VertexThreadInfoTrackerBuilder.java index 949827a5f0e5b..03996e9a25cf6 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/threadinfo/VertexThreadInfoTrackerBuilder.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/threadinfo/VertexThreadInfoTrackerBuilder.java @@ -24,8 +24,8 @@ import org.apache.flink.runtime.webmonitor.threadinfo.VertexThreadInfoTracker.ExecutionVertexKey; import org.apache.flink.runtime.webmonitor.threadinfo.VertexThreadInfoTracker.JobVertexKey; -import org.apache.flink.shaded.guava32.com.google.common.cache.Cache; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheBuilder; +import org.apache.flink.shaded.guava31.com.google.common.cache.Cache; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder; import java.time.Duration; import java.util.concurrent.ScheduledExecutorService; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorRestoringTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorRestoringTest.java index 7cbe099fe4d16..ba7f6a62a9c62 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorRestoringTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorRestoringTest.java @@ -47,7 +47,7 @@ import org.apache.flink.util.concurrent.Executors; import org.apache.flink.util.concurrent.ManuallyTriggeredScheduledExecutor; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorTest.java index 165efddfe2f32..5c63552be7d75 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorTest.java @@ -87,7 +87,7 @@ import org.apache.flink.util.concurrent.ScheduledExecutorServiceAdapter; import org.apache.flink.util.function.TriFunctionWithException; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointStatsTrackerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointStatsTrackerTest.java index 5e377bf840159..a4dc88d519784 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointStatsTrackerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointStatsTrackerTest.java @@ -31,7 +31,7 @@ import org.apache.flink.traces.Span; import org.apache.flink.traces.SpanBuilder; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/InflightDataRescalingDescriptorUtil.java b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/InflightDataRescalingDescriptorUtil.java index 5e59ace392816..94f132f7d5f15 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/InflightDataRescalingDescriptorUtil.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/InflightDataRescalingDescriptorUtil.java @@ -20,7 +20,7 @@ import org.apache.flink.runtime.checkpoint.InflightDataRescalingDescriptor.InflightDataGateOrPartitionRescalingDescriptor; import org.apache.flink.runtime.checkpoint.InflightDataRescalingDescriptor.InflightDataGateOrPartitionRescalingDescriptor.MappingType; -import org.apache.flink.shaded.guava32.com.google.common.collect.Sets; +import org.apache.flink.shaded.guava31.com.google.common.collect.Sets; import java.util.Arrays; import java.util.Set; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStoreITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStoreITCase.java index 10900722d5d6a..206023ca40e78 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStoreITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStoreITCase.java @@ -34,7 +34,7 @@ import org.apache.flink.util.concurrent.ManuallyTriggeredScheduledExecutor; import org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.apache.flink.shaded.zookeeper3.org.apache.zookeeper.data.Stat; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/channel/RecordingChannelStateWriter.java b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/channel/RecordingChannelStateWriter.java index ebdf19f7e1301..b9fd955aa0424 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/channel/RecordingChannelStateWriter.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/channel/RecordingChannelStateWriter.java @@ -21,8 +21,8 @@ import org.apache.flink.runtime.io.network.buffer.Buffer; import org.apache.flink.util.CloseableIterator; -import org.apache.flink.shaded.guava32.com.google.common.collect.LinkedListMultimap; -import org.apache.flink.shaded.guava32.com.google.common.collect.ListMultimap; +import org.apache.flink.shaded.guava31.com.google.common.collect.LinkedListMultimap; +import org.apache.flink.shaded.guava31.com.google.common.collect.ListMultimap; import java.util.Arrays; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/channel/SequentialChannelStateReaderImplTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/channel/SequentialChannelStateReaderImplTest.java index 18b6bb0111be4..568d9b2281073 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/channel/SequentialChannelStateReaderImplTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/channel/SequentialChannelStateReaderImplTest.java @@ -46,7 +46,7 @@ import org.apache.flink.testutils.junit.extensions.parameterized.Parameters; import org.apache.flink.util.function.ThrowingConsumer; -import org.apache.flink.shaded.guava32.com.google.common.io.Closer; +import org.apache.flink.shaded.guava31.com.google.common.io.Closer; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.TestTemplate; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/DispatcherTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/DispatcherTest.java index 1844dfb9da9e3..463a737ac3edb 100755 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/DispatcherTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/DispatcherTest.java @@ -100,7 +100,7 @@ import org.apache.flink.util.Preconditions; import org.apache.flink.util.concurrent.FutureUtils; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableMap; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap; import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpResponseStatus; import org.assertj.core.api.Assertions; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/ExecutionGraphInfoStoreTestUtils.java b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/ExecutionGraphInfoStoreTestUtils.java index e5367db7bed82..35691dedc9c8b 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/ExecutionGraphInfoStoreTestUtils.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/ExecutionGraphInfoStoreTestUtils.java @@ -45,7 +45,7 @@ import org.apache.flink.util.Preconditions; import org.apache.flink.util.concurrent.ScheduledExecutor; -import org.apache.flink.shaded.guava32.com.google.common.base.Ticker; +import org.apache.flink.shaded.guava31.com.google.common.base.Ticker; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/FileExecutionGraphInfoStoreTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/FileExecutionGraphInfoStoreTest.java index 38a17541d6ab8..c8d250052de51 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/FileExecutionGraphInfoStoreTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/FileExecutionGraphInfoStoreTest.java @@ -38,8 +38,8 @@ import org.apache.flink.util.concurrent.ManuallyTriggeredScheduledExecutor; import org.apache.flink.util.concurrent.ScheduledExecutorServiceAdapter; -import org.apache.flink.shaded.guava32.com.google.common.base.Ticker; -import org.apache.flink.shaded.guava32.com.google.common.cache.LoadingCache; +import org.apache.flink.shaded.guava31.com.google.common.base.Ticker; +import org.apache.flink.shaded.guava31.com.google.common.cache.LoadingCache; import org.hamcrest.Matcher; import org.hamcrest.Matchers; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/JobMasterTester.java b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/JobMasterTester.java index 1e3b678f10399..08783509a9fe1 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/JobMasterTester.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/JobMasterTester.java @@ -47,7 +47,7 @@ import org.apache.flink.testutils.TestingUtils; import org.apache.flink.util.concurrent.FutureUtils; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import java.io.Closeable; import java.io.IOException; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/MemoryExecutionGraphInfoStoreTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/MemoryExecutionGraphInfoStoreTest.java index e1064a0f98a73..c1361450e02e8 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/MemoryExecutionGraphInfoStoreTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/MemoryExecutionGraphInfoStoreTest.java @@ -33,7 +33,7 @@ import org.apache.flink.util.concurrent.ManuallyTriggeredScheduledExecutor; import org.apache.flink.util.concurrent.ScheduledExecutorServiceAdapter; -import org.apache.flink.shaded.guava32.com.google.common.base.Ticker; +import org.apache.flink.shaded.guava31.com.google.common.base.Ticker; import org.hamcrest.Matchers; import org.junit.ClassRule; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/DefaultExecutionGraphConstructionTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/DefaultExecutionGraphConstructionTest.java index e574a59fb26e1..99d3551f38543 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/DefaultExecutionGraphConstructionTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/DefaultExecutionGraphConstructionTest.java @@ -36,7 +36,7 @@ import org.apache.flink.testutils.TestingUtils; import org.apache.flink.testutils.executor.TestExecutorExtension; -import org.apache.flink.shaded.guava32.com.google.common.collect.Sets; +import org.apache.flink.shaded.guava31.com.google.common.collect.Sets; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/utils/TestFailoverStrategyFactory.java b/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/utils/TestFailoverStrategyFactory.java index c00b1cae06b96..d215f813c4ec5 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/utils/TestFailoverStrategyFactory.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/utils/TestFailoverStrategyFactory.java @@ -23,7 +23,7 @@ import org.apache.flink.runtime.scheduler.strategy.ExecutionVertexID; import org.apache.flink.runtime.scheduler.strategy.SchedulingTopology; -import org.apache.flink.shaded.guava32.com.google.common.collect.Sets; +import org.apache.flink.shaded.guava31.com.google.common.collect.Sets; import java.util.Set; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/filecache/FileCacheReadsFromBlobTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/filecache/FileCacheReadsFromBlobTest.java index 6a30dd703a69d..cd901a9b8c63d 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/filecache/FileCacheReadsFromBlobTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/filecache/FileCacheReadsFromBlobTest.java @@ -28,7 +28,7 @@ import org.apache.flink.util.FileUtils; import org.apache.flink.util.InstantiationUtil; -import org.apache.flink.shaded.guava32.com.google.common.io.Files; +import org.apache.flink.shaded.guava31.com.google.common.io.Files; import org.junit.After; import org.junit.Before; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/JobMasterPartitionTrackerImplTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/JobMasterPartitionTrackerImplTest.java index 09ac9c26e190f..70aa477bdd571 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/JobMasterPartitionTrackerImplTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/JobMasterPartitionTrackerImplTest.java @@ -28,7 +28,7 @@ import org.apache.flink.runtime.taskexecutor.TaskExecutorGateway; import org.apache.flink.runtime.taskexecutor.TestingTaskExecutorGatewayBuilder; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/TaskExecutorPartitionTrackerImplTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/TaskExecutorPartitionTrackerImplTest.java index eb0ecd19fb272..225062e221e48 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/TaskExecutorPartitionTrackerImplTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/TaskExecutorPartitionTrackerImplTest.java @@ -32,7 +32,7 @@ import org.apache.flink.runtime.shuffle.ShuffleIOOwnerContext; import org.apache.flink.runtime.taskexecutor.partition.ClusterPartitionReport; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/LocalInputChannelTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/LocalInputChannelTest.java index e49e58a48d4a8..fdd931cae1094 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/LocalInputChannelTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/LocalInputChannelTest.java @@ -53,7 +53,7 @@ import org.apache.flink.util.concurrent.FutureUtils; import org.apache.flink.util.function.CheckedSupplier; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.jupiter.api.Test; import org.mockito.stubbing.Answer; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/RemoteInputChannelTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/RemoteInputChannelTest.java index 0cfb031f9680c..ba73327a73c03 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/RemoteInputChannelTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/RemoteInputChannelTest.java @@ -63,7 +63,7 @@ import org.apache.flink.util.CloseableIterator; import org.apache.flink.util.ExceptionUtils; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/SingleInputGateTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/SingleInputGateTest.java index 14f780dde2839..071a23ad34bc3 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/SingleInputGateTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/SingleInputGateTest.java @@ -72,7 +72,7 @@ import org.apache.flink.runtime.shuffle.UnknownShuffleDescriptor; import org.apache.flink.runtime.util.NettyShuffleDescriptorBuilder; -import org.apache.flink.shaded.guava32.com.google.common.io.Closer; +import org.apache.flink.shaded.guava31.com.google.common.io.Closer; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestPooledBufferProvider.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestPooledBufferProvider.java index 1e7b4e0e20719..7160101259227 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestPooledBufferProvider.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestPooledBufferProvider.java @@ -26,7 +26,7 @@ import org.apache.flink.runtime.io.network.buffer.BufferRecycler; import org.apache.flink.runtime.io.network.buffer.NetworkBuffer; -import org.apache.flink.shaded.guava32.com.google.common.collect.Queues; +import org.apache.flink.shaded.guava31.com.google.common.collect.Queues; import java.util.Queue; import java.util.concurrent.BlockingQueue; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalTopologyTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalTopologyTest.java index 4b90fbd7abbb5..88880703457a8 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalTopologyTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalTopologyTest.java @@ -26,7 +26,7 @@ import org.apache.flink.util.IterableUtils; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.Before; import org.junit.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/DefaultJobMasterServiceProcessTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/DefaultJobMasterServiceProcessTest.java index 2b297eb5f7eb1..792dd085f31c9 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/DefaultJobMasterServiceProcessTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/DefaultJobMasterServiceProcessTest.java @@ -32,7 +32,7 @@ import org.apache.flink.runtime.scheduler.exceptionhistory.RootExceptionHistoryEntry; import org.apache.flink.util.SerializedThrowable; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/BlocklistDeclarativeSlotPoolTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/BlocklistDeclarativeSlotPoolTest.java index af5354ddbb766..b5b893fc6ff21 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/BlocklistDeclarativeSlotPoolTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/BlocklistDeclarativeSlotPoolTest.java @@ -50,7 +50,7 @@ import static org.apache.flink.runtime.jobmaster.slotpool.DefaultDeclarativeSlotPoolTest.drainNewSlotService; import static org.apache.flink.runtime.jobmaster.slotpool.DefaultDeclarativeSlotPoolTest.increaseRequirementsAndOfferSlotsToSlotPool; import static org.apache.flink.runtime.jobmaster.slotpool.SlotPoolTestUtils.createSlotOffersForResourceRequirements; -import static org.apache.flink.shaded.guava32.com.google.common.collect.Iterables.getOnlyElement; +import static org.apache.flink.shaded.guava31.com.google.common.collect.Iterables.getOnlyElement; import static org.assertj.core.api.Assertions.assertThat; /** Test for {@link BlocklistDeclarativeSlotPool}. */ diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DeclarativeSlotPoolServiceTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DeclarativeSlotPoolServiceTest.java index 91b16a24ddb32..811406695f3ed 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DeclarativeSlotPoolServiceTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DeclarativeSlotPoolServiceTest.java @@ -41,7 +41,7 @@ import org.apache.flink.util.FlinkException; import org.apache.flink.util.clock.SystemClock; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DefaultAllocatedSlotPoolTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DefaultAllocatedSlotPoolTest.java index 0832aa983b004..2fe2b9e645ee9 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DefaultAllocatedSlotPoolTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DefaultAllocatedSlotPoolTest.java @@ -28,7 +28,7 @@ import org.apache.flink.runtime.taskmanager.LocalTaskManagerLocation; import org.apache.flink.runtime.taskmanager.TaskManagerLocation; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DefaultDeclarativeSlotPoolTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DefaultDeclarativeSlotPoolTest.java index 895423304c72b..bf57aab2b667b 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DefaultDeclarativeSlotPoolTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/DefaultDeclarativeSlotPoolTest.java @@ -34,7 +34,7 @@ import org.apache.flink.util.FlinkException; import org.apache.flink.util.function.QuadConsumer; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SimpleRequestSlotMatchingStrategyTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SimpleRequestSlotMatchingStrategyTest.java index 8a9bb5a732fd0..d24eac08c9c9c 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SimpleRequestSlotMatchingStrategyTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/SimpleRequestSlotMatchingStrategyTest.java @@ -23,7 +23,7 @@ import org.apache.flink.runtime.scheduler.TestingPhysicalSlot; import org.apache.flink.util.TestLoggerExtension; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterators; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterators; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionDriverTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionDriverTest.java index f187213d571f6..f1199cda3c5ca 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionDriverTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionDriverTest.java @@ -34,7 +34,7 @@ import org.apache.flink.util.function.RunnableWithException; import org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/MetricRegistryImplTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/MetricRegistryImplTest.java index 51652b843079e..b6d1f02055e84 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/MetricRegistryImplTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/MetricRegistryImplTest.java @@ -44,7 +44,7 @@ import org.apache.flink.runtime.rpc.TestingRpcService; import org.apache.flink.runtime.webmonitor.retriever.MetricQueryServiceGateway; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterators; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterators; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/FrontMetricGroupTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/FrontMetricGroupTest.java index d0aac2b0aeb8f..8167a6a037653 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/FrontMetricGroupTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/FrontMetricGroupTest.java @@ -24,7 +24,7 @@ import org.apache.flink.runtime.metrics.scope.ScopeFormats; import org.apache.flink.runtime.metrics.util.TestingMetricRegistry; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableMap; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/util/MetricUtilsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/util/MetricUtilsTest.java index e2182aa9daf61..b74e6ad53125e 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/util/MetricUtilsTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/util/MetricUtilsTest.java @@ -38,7 +38,7 @@ import org.apache.flink.util.FlinkException; import org.apache.flink.util.function.CheckedSupplier; -import org.apache.flink.shaded.guava32.com.google.common.collect.Sets; +import org.apache.flink.shaded.guava31.com.google.common.collect.Sets; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/coordination/CoordinatorEventsExactlyOnceITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/coordination/CoordinatorEventsExactlyOnceITCase.java index 49fbdc6e70161..03fcec9114cf5 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/coordination/CoordinatorEventsExactlyOnceITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/coordination/CoordinatorEventsExactlyOnceITCase.java @@ -50,7 +50,7 @@ import org.apache.flink.util.InstantiationUtil; import org.apache.flink.util.SerializedValue; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterators; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterators; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/InPlaceMutableHashTableTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/InPlaceMutableHashTableTest.java index 929f35c94677c..8d02910b49800 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/InPlaceMutableHashTableTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/InPlaceMutableHashTableTest.java @@ -42,7 +42,7 @@ import org.apache.flink.util.Collector; import org.apache.flink.util.MutableObjectIterator; -import org.apache.flink.shaded.guava32.com.google.common.collect.Ordering; +import org.apache.flink.shaded.guava31.com.google.common.collect.Ordering; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/active/ActiveResourceManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/active/ActiveResourceManagerTest.java index 73ec331245ee3..1c1133662fbc4 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/active/ActiveResourceManagerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/active/ActiveResourceManagerTest.java @@ -53,7 +53,7 @@ import org.apache.flink.runtime.util.TestingFatalErrorHandler; import org.apache.flink.util.function.RunnableWithException; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableSet; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableSet; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/checkpoints/AbstractCheckpointStatsHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/checkpoints/AbstractCheckpointStatsHandlerTest.java index 38dd36ad67b6d..9f629a84916e0 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/checkpoints/AbstractCheckpointStatsHandlerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/checkpoints/AbstractCheckpointStatsHandlerTest.java @@ -38,8 +38,8 @@ import org.apache.flink.runtime.webmonitor.retriever.GatewayRetriever; import org.apache.flink.util.concurrent.Executors; -import org.apache.flink.shaded.guava32.com.google.common.cache.Cache; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheBuilder; +import org.apache.flink.shaded.guava31.com.google.common.cache.Cache; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder; import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpResponseStatus; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/AvailableInputsLocationsRetrieverTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/AvailableInputsLocationsRetrieverTest.java index 1070bd584c1d2..7eb112c57bae8 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/AvailableInputsLocationsRetrieverTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/AvailableInputsLocationsRetrieverTest.java @@ -21,7 +21,7 @@ import org.apache.flink.runtime.scheduler.strategy.ConsumedPartitionGroup; import org.apache.flink.runtime.scheduler.strategy.ExecutionVertexID; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/DefaultSchedulerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/DefaultSchedulerTest.java index 24c530c53c662..d109bb635d75b 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/DefaultSchedulerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/DefaultSchedulerTest.java @@ -104,7 +104,7 @@ import org.apache.flink.util.concurrent.ManuallyTriggeredScheduledExecutor; import org.apache.flink.util.concurrent.ScheduledExecutor; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/ExecutionGraphInfoTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/ExecutionGraphInfoTest.java index 5630fd40497cf..b743eedfe39e7 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/ExecutionGraphInfoTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/ExecutionGraphInfoTest.java @@ -24,7 +24,7 @@ import org.apache.flink.runtime.executiongraph.ErrorInfo; import org.apache.flink.runtime.scheduler.exceptionhistory.RootExceptionHistoryEntry; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adapter/DefaultExecutionTopologyTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adapter/DefaultExecutionTopologyTest.java index eb603e1ef2d5f..7e1c934ad2893 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adapter/DefaultExecutionTopologyTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adapter/DefaultExecutionTopologyTest.java @@ -40,7 +40,7 @@ import org.apache.flink.testutils.executor.TestExecutorExtension; import org.apache.flink.util.IterableUtils; -import org.apache.flink.shaded.guava32.com.google.common.collect.Sets; +import org.apache.flink.shaded.guava31.com.google.common.collect.Sets; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adapter/DefaultSchedulingPipelinedRegionTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adapter/DefaultSchedulingPipelinedRegionTest.java index 5d2c421932c84..cf823a9ac527e 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adapter/DefaultSchedulingPipelinedRegionTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adapter/DefaultSchedulingPipelinedRegionTest.java @@ -33,7 +33,7 @@ import org.apache.flink.testutils.executor.TestExecutorResource; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.ClassRule; import org.junit.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/AdaptiveBatchSchedulerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/AdaptiveBatchSchedulerTest.java index 93e6d2c1773e6..7930aedc31570 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/AdaptiveBatchSchedulerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/AdaptiveBatchSchedulerTest.java @@ -76,7 +76,7 @@ import static org.apache.flink.runtime.scheduler.SchedulerTestingUtils.createFailedTaskExecutionState; import static org.apache.flink.runtime.scheduler.SchedulerTestingUtils.createFinishedTaskExecutionState; import static org.apache.flink.runtime.scheduler.adaptivebatch.DefaultVertexParallelismAndInputInfosDeciderTest.createDecider; -import static org.apache.flink.shaded.guava32.com.google.common.collect.Iterables.getOnlyElement; +import static org.apache.flink.shaded.guava31.com.google.common.collect.Iterables.getOnlyElement; import static org.assertj.core.api.Assertions.assertThat; /** Test for {@link AdaptiveBatchScheduler}. */ diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/DefaultVertexParallelismAndInputInfosDeciderTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/DefaultVertexParallelismAndInputInfosDeciderTest.java index a9ec266940651..a6741d2bd9e4a 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/DefaultVertexParallelismAndInputInfosDeciderTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/DefaultVertexParallelismAndInputInfosDeciderTest.java @@ -29,7 +29,7 @@ import org.apache.flink.runtime.jobgraph.IntermediateDataSetID; import org.apache.flink.runtime.jobgraph.JobVertexID; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/SpeculativeSchedulerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/SpeculativeSchedulerTest.java index 3880b52df8a2c..1bde7878c4e9e 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/SpeculativeSchedulerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptivebatch/SpeculativeSchedulerTest.java @@ -54,8 +54,8 @@ import org.apache.flink.util.ExecutorUtils; import org.apache.flink.util.concurrent.ManuallyTriggeredScheduledExecutor; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableMap; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/exceptionhistory/FailureHandlingResultSnapshotTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/exceptionhistory/FailureHandlingResultSnapshotTest.java index 21ed10c03575e..96c191f6a3746 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/exceptionhistory/FailureHandlingResultSnapshotTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/exceptionhistory/FailureHandlingResultSnapshotTest.java @@ -40,7 +40,7 @@ import org.apache.flink.util.FlinkException; import org.apache.flink.util.SerializedThrowable; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/exceptionhistory/RootExceptionHistoryEntryTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/exceptionhistory/RootExceptionHistoryEntryTest.java index 61c1a156cf243..b06402a6b57f0 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/exceptionhistory/RootExceptionHistoryEntryTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/exceptionhistory/RootExceptionHistoryEntryTest.java @@ -33,7 +33,7 @@ import org.apache.flink.testutils.TestingUtils; import org.apache.flink.testutils.executor.TestExecutorExtension; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/security/SecurityUtilsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/security/SecurityUtilsTest.java index 1290430290679..9e04788c83235 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/security/SecurityUtilsTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/security/SecurityUtilsTest.java @@ -29,7 +29,7 @@ import org.apache.flink.runtime.security.contexts.TestSecurityContextFactory; import org.apache.flink.runtime.security.modules.TestSecurityModuleFactory; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.AfterClass; import org.junit.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/shuffle/NettyShuffleUtilsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/shuffle/NettyShuffleUtilsTest.java index d0a2da8044d25..3048937b60895 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/shuffle/NettyShuffleUtilsTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/shuffle/NettyShuffleUtilsTest.java @@ -36,7 +36,7 @@ import org.apache.flink.runtime.jobgraph.IntermediateDataSetID; import org.apache.flink.runtime.jobgraph.IntermediateResultPartitionID; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableMap; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/InternalPriorityQueueTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/InternalPriorityQueueTestBase.java index 6856f02d07cd8..d26e1bd8ee845 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/InternalPriorityQueueTestBase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/InternalPriorityQueueTestBase.java @@ -29,7 +29,7 @@ import org.apache.flink.util.CloseableIterator; import org.apache.flink.util.MathUtils; -import org.apache.flink.shaded.guava32.com.google.common.primitives.UnsignedBytes; +import org.apache.flink.shaded.guava31.com.google.common.primitives.UnsignedBytes; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendTestBase.java index dd718b9d1a9d4..d036955d0c876 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendTestBase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendTestBase.java @@ -81,7 +81,7 @@ import org.apache.flink.util.IOUtils; import org.apache.flink.util.StateMigrationException; -import org.apache.flink.shaded.guava32.com.google.common.base.Joiner; +import org.apache.flink.shaded.guava31.com.google.common.base.Joiner; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/TaskExecutorLocalStateStoresManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/TaskExecutorLocalStateStoresManagerTest.java index 81291745f6c1f..c50dca11683b3 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/TaskExecutorLocalStateStoresManagerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/TaskExecutorLocalStateStoresManagerTest.java @@ -37,7 +37,7 @@ import org.apache.flink.util.Reference; import org.apache.flink.util.concurrent.Executors; -import org.apache.flink.shaded.guava32.com.google.common.collect.Sets; +import org.apache.flink.shaded.guava31.com.google.common.collect.Sets; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlMapStateAllEntriesTestContext.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlMapStateAllEntriesTestContext.java index a0ae7e96d0afb..003f8a66f933a 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlMapStateAllEntriesTestContext.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlMapStateAllEntriesTestContext.java @@ -20,7 +20,7 @@ import org.apache.flink.api.java.tuple.Tuple2; -import org.apache.flink.shaded.guava32.com.google.common.collect.Sets; +import org.apache.flink.shaded.guava31.com.google.common.collect.Sets; import java.util.Arrays; import java.util.Collections; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorTest.java index e532bb51e1e70..3804cc565bc09 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorTest.java @@ -120,7 +120,7 @@ import org.apache.flink.util.function.TriConsumerWithException; import org.apache.flink.shaded.curator5.com.google.common.collect.Iterators; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunnerConfigurationTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunnerConfigurationTest.java index 8d7847a822f0f..5b36abb6acbe8 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunnerConfigurationTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunnerConfigurationTest.java @@ -39,7 +39,7 @@ import org.apache.flink.util.IOUtils; import org.apache.flink.util.concurrent.Executors; -import org.apache.flink.shaded.guava32.com.google.common.net.InetAddresses; +import org.apache.flink.shaded.guava31.com.google.common.net.InetAddresses; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunnerStartupTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunnerStartupTest.java index 230df244c83a3..9884727544301 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunnerStartupTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunnerStartupTest.java @@ -44,7 +44,7 @@ import org.apache.flink.testutils.junit.utils.TempDirUtils; import org.apache.flink.util.IOUtils; -import org.apache.flink.shaded.guava32.com.google.common.collect.Sets; +import org.apache.flink.shaded.guava31.com.google.common.collect.Sets; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.AfterEach; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/slot/FileSlotAllocationSnapshotPersistenceServiceTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/slot/FileSlotAllocationSnapshotPersistenceServiceTest.java index 6a5953194b3b0..3b83ec05226df 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/slot/FileSlotAllocationSnapshotPersistenceServiceTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/slot/FileSlotAllocationSnapshotPersistenceServiceTest.java @@ -24,7 +24,7 @@ import org.apache.flink.runtime.clusterframework.types.ResourceProfile; import org.apache.flink.runtime.clusterframework.types.SlotID; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/slot/TaskSlotTableImplTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/slot/TaskSlotTableImplTest.java index bcc8bdecd4fed..6cd166cc5ace8 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/slot/TaskSlotTableImplTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/slot/TaskSlotTableImplTest.java @@ -31,7 +31,7 @@ import org.apache.flink.testutils.executor.TestExecutorExtension; import org.apache.flink.util.function.TriFunctionWithException; -import org.apache.flink.shaded.guava32.com.google.common.collect.Sets; +import org.apache.flink.shaded.guava31.com.google.common.collect.Sets; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/util/DefaultGroupCacheTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/util/DefaultGroupCacheTest.java index b76a218436816..b5a3b717094fc 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/util/DefaultGroupCacheTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/util/DefaultGroupCacheTest.java @@ -26,7 +26,7 @@ import org.apache.flink.runtime.shuffle.ShuffleDescriptor; import org.apache.flink.runtime.shuffle.UnknownShuffleDescriptor; -import org.apache.flink.shaded.guava32.com.google.common.base.Ticker; +import org.apache.flink.shaded.guava31.com.google.common.base.Ticker; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/util/ManualTicker.java b/flink-runtime/src/test/java/org/apache/flink/runtime/util/ManualTicker.java index d68c02e2fdbc9..bd64cb026bc54 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/util/ManualTicker.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/util/ManualTicker.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.util; -import org.apache.flink.shaded.guava32.com.google.common.base.Ticker; +import org.apache.flink.shaded.guava31.com.google.common.base.Ticker; import java.util.concurrent.TimeUnit; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/util/ResourceCounterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/util/ResourceCounterTest.java index 2a6d28b56e596..8c368644b61b7 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/util/ResourceCounterTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/util/ResourceCounterTest.java @@ -20,7 +20,7 @@ import org.apache.flink.runtime.clusterframework.types.ResourceProfile; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableMap; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/util/RunnablesTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/util/RunnablesTest.java index 039a7914db9a0..07631d10479b3 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/util/RunnablesTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/util/RunnablesTest.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.util; -import org.apache.flink.shaded.guava32.com.google.common.util.concurrent.ThreadFactoryBuilder; +import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.ThreadFactoryBuilder; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/util/ZooKeeperUtilsTreeCacheTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/util/ZooKeeperUtilsTreeCacheTest.java index 985d07acd70b2..22e6d8b5c144d 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/util/ZooKeeperUtilsTreeCacheTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/util/ZooKeeperUtilsTreeCacheTest.java @@ -28,7 +28,7 @@ import org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.TreeCache; import org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.TreeCacheEvent; import org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.TreeCacheListener; -import org.apache.flink.shaded.guava32.com.google.common.io.Closer; +import org.apache.flink.shaded.guava31.com.google.common.io.Closer; import org.apache.curator.test.TestingServer; import org.junit.jupiter.api.AfterEach; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/webmonitor/threadinfo/ThreadInfoRequestCoordinatorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/webmonitor/threadinfo/ThreadInfoRequestCoordinatorTest.java index 88578113f4757..4dfcade0777e6 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/webmonitor/threadinfo/ThreadInfoRequestCoordinatorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/webmonitor/threadinfo/ThreadInfoRequestCoordinatorTest.java @@ -25,7 +25,7 @@ import org.apache.flink.runtime.taskexecutor.TaskExecutorThreadInfoGateway; import org.apache.flink.runtime.util.JvmUtils; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableSet; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableSet; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/webmonitor/threadinfo/VertexThreadInfoTrackerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/webmonitor/threadinfo/VertexThreadInfoTrackerTest.java index 403f59fd7fcb4..d39ecf265f191 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/webmonitor/threadinfo/VertexThreadInfoTrackerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/webmonitor/threadinfo/VertexThreadInfoTrackerTest.java @@ -42,11 +42,11 @@ import org.apache.flink.testutils.junit.extensions.parameterized.ParameterizedTestExtension; import org.apache.flink.testutils.junit.extensions.parameterized.Parameters; -import org.apache.flink.shaded.guava32.com.google.common.cache.Cache; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheBuilder; -import org.apache.flink.shaded.guava32.com.google.common.cache.RemovalListener; -import org.apache.flink.shaded.guava32.com.google.common.cache.RemovalNotification; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableSet; +import org.apache.flink.shaded.guava31.com.google.common.cache.Cache; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder; +import org.apache.flink.shaded.guava31.com.google.common.cache.RemovalListener; +import org.apache.flink.shaded.guava31.com.google.common.cache.RemovalNotification; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableSet; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/zookeeper/ZooKeeperStateHandleStoreTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/zookeeper/ZooKeeperStateHandleStoreTest.java index 09f9dfef629d4..54c5798b94dca 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/zookeeper/ZooKeeperStateHandleStoreTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/zookeeper/ZooKeeperStateHandleStoreTest.java @@ -35,7 +35,7 @@ import org.apache.flink.util.InstantiationUtil; import org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.apache.flink.shaded.zookeeper3.org.apache.zookeeper.KeeperException; import org.apache.flink.shaded.zookeeper3.org.apache.zookeeper.data.Stat; diff --git a/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/TraversableSerializer.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/TraversableSerializer.scala index 0483860067d9d..9383674bf8c8a 100644 --- a/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/TraversableSerializer.scala +++ b/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/TraversableSerializer.scala @@ -20,7 +20,7 @@ package org.apache.flink.api.scala.typeutils import org.apache.flink.annotation.Internal import org.apache.flink.api.common.typeutils._ import org.apache.flink.core.memory.{DataInputView, DataOutputView} -import org.apache.flink.shaded.guava32.com.google.common.cache.{Cache, CacheBuilder} +import org.apache.flink.shaded.guava31.com.google.common.cache.{Cache, CacheBuilder} import java.io.ObjectInputStream import java.util.concurrent.Callable diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogKeyedStateBackend.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogKeyedStateBackend.java index 709e9aa30ce5e..dbce58687d52f 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogKeyedStateBackend.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogKeyedStateBackend.java @@ -68,7 +68,7 @@ import org.apache.flink.state.changelog.restore.FunctionDelegationHelper; import org.apache.flink.state.common.PeriodicMaterializationManager.MaterializationTarget; -import org.apache.flink.shaded.guava32.com.google.common.io.Closer; +import org.apache.flink.shaded.guava31.com.google.common.io.Closer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-state-backends/flink-statebackend-common/src/test/java/org/apache/flink/state/common/PeriodicMaterializationManagerTest.java b/flink-state-backends/flink-statebackend-common/src/test/java/org/apache/flink/state/common/PeriodicMaterializationManagerTest.java index 05dfad4acc525..0289317e3b39f 100644 --- a/flink-state-backends/flink-statebackend-common/src/test/java/org/apache/flink/state/common/PeriodicMaterializationManagerTest.java +++ b/flink-state-backends/flink-statebackend-common/src/test/java/org/apache/flink/state/common/PeriodicMaterializationManagerTest.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static org.apache.flink.shaded.guava32.com.google.common.collect.Iterators.getOnlyElement; +import static org.apache.flink.shaded.guava31.com.google.common.collect.Iterators.getOnlyElement; import static org.apache.flink.util.concurrent.Executors.newDirectExecutorService; import static org.assertj.core.api.Assertions.assertThat; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBCachingPriorityQueueSet.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBCachingPriorityQueueSet.java index 5c154ad2e7631..b3d0112dc60ec 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBCachingPriorityQueueSet.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBCachingPriorityQueueSet.java @@ -28,7 +28,7 @@ import org.apache.flink.util.CloseableIterator; import org.apache.flink.util.FlinkRuntimeException; -import org.apache.flink.shaded.guava32.com.google.common.primitives.UnsignedBytes; +import org.apache.flink.shaded.guava31.com.google.common.primitives.UnsignedBytes; import org.rocksdb.ColumnFamilyHandle; import org.rocksdb.ReadOptions; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBStateDownloader.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBStateDownloader.java index 7e88604a16ee0..af1694c66e79d 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBStateDownloader.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBStateDownloader.java @@ -29,7 +29,7 @@ import org.apache.flink.util.concurrent.FutureUtils; import org.apache.flink.util.function.ThrowingRunnable; -import org.apache.flink.shaded.guava32.com.google.common.collect.Streams; +import org.apache.flink.shaded.guava31.com.google.common.collect.Streams; import java.io.IOException; import java.io.OutputStream; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamGraphHasherV2.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamGraphHasherV2.java index e9cff0204c06c..0df584ac01a67 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamGraphHasherV2.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamGraphHasherV2.java @@ -22,9 +22,9 @@ import org.apache.flink.runtime.jobgraph.JobVertexID; import org.apache.flink.streaming.api.operators.UdfStreamOperatorFactory; -import org.apache.flink.shaded.guava32.com.google.common.hash.HashFunction; -import org.apache.flink.shaded.guava32.com.google.common.hash.Hasher; -import org.apache.flink.shaded.guava32.com.google.common.hash.Hashing; +import org.apache.flink.shaded.guava31.com.google.common.hash.HashFunction; +import org.apache.flink.shaded.guava31.com.google.common.hash.Hasher; +import org.apache.flink.shaded.guava31.com.google.common.hash.Hashing; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/OperatorSnapshotFutures.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/OperatorSnapshotFutures.java index 908e139a864dc..ad4bbab170769 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/OperatorSnapshotFutures.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/OperatorSnapshotFutures.java @@ -28,7 +28,7 @@ import org.apache.flink.runtime.state.SnapshotResult; import org.apache.flink.runtime.state.StateObject; -import org.apache.flink.shaded.guava32.com.google.common.io.Closer; +import org.apache.flink.shaded.guava31.com.google.common.io.Closer; import javax.annotation.Nonnull; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorStateHandler.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorStateHandler.java index 445282a6a36d2..eb8a01b91ebc5 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorStateHandler.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorStateHandler.java @@ -56,7 +56,7 @@ import org.apache.flink.util.CloseableIterable; import org.apache.flink.util.IOUtils; -import org.apache.flink.shaded.guava32.com.google.common.io.Closer; +import org.apache.flink.shaded.guava31.com.google.common.io.Closer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/CacheTransformation.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/CacheTransformation.java index c90eb3ae4b643..4632c9b020db6 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/CacheTransformation.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/CacheTransformation.java @@ -21,7 +21,7 @@ import org.apache.flink.api.dag.Transformation; import org.apache.flink.util.AbstractID; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import java.util.Collections; import java.util.List; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/CoFeedbackTransformation.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/CoFeedbackTransformation.java index 0044af1d6b494..11f8a912608db 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/CoFeedbackTransformation.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/CoFeedbackTransformation.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.dag.Transformation; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import java.util.Collections; import java.util.List; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/FeedbackTransformation.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/FeedbackTransformation.java index d51efbc912056..ab8f742474148 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/FeedbackTransformation.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/FeedbackTransformation.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.dag.Transformation; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import java.util.Collections; import java.util.List; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/LegacySinkTransformation.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/LegacySinkTransformation.java index d97c0f9aa0107..a0bd6417881ce 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/LegacySinkTransformation.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/LegacySinkTransformation.java @@ -35,7 +35,7 @@ import org.apache.flink.streaming.api.operators.StreamSink; import org.apache.flink.streaming.api.operators.UserFunctionProvider; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import java.util.Collections; import java.util.List; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/OneInputTransformation.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/OneInputTransformation.java index 55cbee8a4bbf5..0a3957130fcd0 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/OneInputTransformation.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/OneInputTransformation.java @@ -28,7 +28,7 @@ import org.apache.flink.streaming.api.operators.SimpleOperatorFactory; import org.apache.flink.streaming.api.operators.StreamOperatorFactory; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import java.util.Collections; import java.util.List; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/PartitionTransformation.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/PartitionTransformation.java index 95d9ac6c75e2b..92d3f26473152 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/PartitionTransformation.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/PartitionTransformation.java @@ -22,7 +22,7 @@ import org.apache.flink.api.dag.Transformation; import org.apache.flink.streaming.runtime.partitioner.StreamPartitioner; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import java.util.Collections; import java.util.List; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/ReduceTransformation.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/ReduceTransformation.java index 28eb9698f9710..da159f3af1177 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/ReduceTransformation.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/ReduceTransformation.java @@ -26,7 +26,7 @@ import org.apache.flink.streaming.api.datastream.KeyedStream; import org.apache.flink.streaming.api.operators.ChainingStrategy; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import java.util.Collections; import java.util.List; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/SideOutputTransformation.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/SideOutputTransformation.java index fbf6b5216a520..3177bfa0eb10c 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/SideOutputTransformation.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/SideOutputTransformation.java @@ -21,7 +21,7 @@ import org.apache.flink.api.dag.Transformation; import org.apache.flink.util.OutputTag; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import java.util.Collections; import java.util.List; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/SinkTransformation.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/SinkTransformation.java index 48a847f4acc15..bdaa8d2dede4e 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/SinkTransformation.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/SinkTransformation.java @@ -27,7 +27,7 @@ Licensed to the Apache Software Foundation (ASF) under one import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.operators.ChainingStrategy; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import javax.annotation.Nullable; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/SourceTransformationWrapper.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/SourceTransformationWrapper.java index 3d3e227f0bb64..d536000fde28c 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/SourceTransformationWrapper.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/SourceTransformationWrapper.java @@ -23,7 +23,7 @@ Licensed to the Apache Software Foundation (ASF) under one import org.apache.flink.api.dag.Transformation; import org.apache.flink.streaming.api.graph.TransformationTranslator; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import java.util.Collections; import java.util.List; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/TimestampsAndWatermarksTransformation.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/TimestampsAndWatermarksTransformation.java index d121301c37f1e..c8bde911a0476 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/TimestampsAndWatermarksTransformation.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/TimestampsAndWatermarksTransformation.java @@ -25,7 +25,7 @@ Licensed to the Apache Software Foundation (ASF) under one import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.operators.ChainingStrategy; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import java.util.Collections; import java.util.List; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/TwoInputTransformation.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/TwoInputTransformation.java index 23deb2bd25685..4c576170741df 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/TwoInputTransformation.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/TwoInputTransformation.java @@ -28,7 +28,7 @@ import org.apache.flink.streaming.api.operators.StreamOperatorFactory; import org.apache.flink.streaming.api.operators.TwoInputStreamOperator; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import java.util.ArrayList; import java.util.List; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/UnionTransformation.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/UnionTransformation.java index 9f3668419957b..dd29206a9ac28 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/UnionTransformation.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/UnionTransformation.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.dag.Transformation; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import java.util.ArrayList; import java.util.List; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/evictors/DeltaEvictor.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/evictors/DeltaEvictor.java index acd97e830d006..fbbd6533490fd 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/evictors/DeltaEvictor.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/evictors/DeltaEvictor.java @@ -23,7 +23,7 @@ import org.apache.flink.streaming.api.windowing.windows.Window; import org.apache.flink.streaming.runtime.operators.windowing.TimestampedValue; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import java.util.Iterator; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/recovery/DemultiplexingRecordDeserializer.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/recovery/DemultiplexingRecordDeserializer.java index 68a4e73fc5938..cd61bf9cae2a1 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/recovery/DemultiplexingRecordDeserializer.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/recovery/DemultiplexingRecordDeserializer.java @@ -30,7 +30,7 @@ import org.apache.flink.streaming.runtime.watermarkstatus.WatermarkStatus; import org.apache.flink.util.CloseableIterator; -import org.apache.flink.shaded.guava32.com.google.common.collect.Maps; +import org.apache.flink.shaded.guava31.com.google.common.collect.Maps; import java.io.IOException; import java.util.Collection; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/recovery/RescalingStreamTaskNetworkInput.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/recovery/RescalingStreamTaskNetworkInput.java index 7ae35e19e1b45..7b8002eee2a97 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/recovery/RescalingStreamTaskNetworkInput.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/recovery/RescalingStreamTaskNetworkInput.java @@ -45,7 +45,7 @@ import org.apache.flink.streaming.runtime.watermarkstatus.StatusWatermarkValve; import org.apache.flink.util.CollectionUtil; -import org.apache.flink.shaded.guava32.com.google.common.collect.Maps; +import org.apache.flink.shaded.guava31.com.google.common.collect.Maps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/StatefulSinkWriterStateHandler.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/StatefulSinkWriterStateHandler.java index 3c70627a50e83..ed390822c1bc8 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/StatefulSinkWriterStateHandler.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/StatefulSinkWriterStateHandler.java @@ -34,7 +34,7 @@ import org.apache.flink.util.CollectionUtil; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import java.util.ArrayList; import java.util.Collection; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperator.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperator.java index a484d21335ec0..c27c258b9d0f7 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperator.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperator.java @@ -38,9 +38,9 @@ import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; import org.apache.flink.util.OutputTag; -import org.apache.flink.shaded.guava32.com.google.common.base.Function; -import org.apache.flink.shaded.guava32.com.google.common.collect.FluentIterable; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.base.Function; +import org.apache.flink.shaded.guava31.com.google.common.collect.FluentIterable; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import java.util.Collection; import java.util.stream.Collectors; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OperatorChain.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OperatorChain.java index da3855c006410..2a7a8dc3c1b54 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OperatorChain.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OperatorChain.java @@ -71,7 +71,7 @@ import org.apache.flink.util.OutputTag; import org.apache.flink.util.SerializedValue; -import org.apache.flink.shaded.guava32.com.google.common.io.Closer; +import org.apache.flink.shaded.guava31.com.google.common.io.Closer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/AggregationFunctionTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/AggregationFunctionTest.java index 6c3068adf1778..a108ca721b75b 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/AggregationFunctionTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/AggregationFunctionTest.java @@ -34,7 +34,7 @@ import org.apache.flink.streaming.util.MockContext; import org.apache.flink.streaming.util.keys.KeySelectorUtil; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; import org.junit.Test; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGeneratorTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGeneratorTest.java index 1c716d4720adb..1e7c6f7ce3b45 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGeneratorTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGeneratorTest.java @@ -128,7 +128,7 @@ import org.apache.flink.util.SerializedValue; import org.apache.flink.util.TestLoggerExtension; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.assertj.core.api.Assertions; import org.assertj.core.data.Offset; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/async/AsyncWaitOperatorTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/async/AsyncWaitOperatorTest.java index 06ff1a267b0e8..d7f7b57ad22cb 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/async/AsyncWaitOperatorTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/async/AsyncWaitOperatorTest.java @@ -64,7 +64,7 @@ import org.apache.flink.util.Preconditions; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.hamcrest.Matchers; import org.junit.Assert; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/co/IntervalJoinOperatorTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/co/IntervalJoinOperatorTest.java index ab57a57d0748a..dc68c5ad2cc06 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/co/IntervalJoinOperatorTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/co/IntervalJoinOperatorTest.java @@ -36,8 +36,8 @@ import org.apache.flink.util.FlinkException; import org.apache.flink.util.OutputTag; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.Assert; import org.junit.Test; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointedInputGateTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointedInputGateTest.java index 073cbf5dfd58e..55be17d4f2949 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointedInputGateTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointedInputGateTest.java @@ -50,7 +50,7 @@ import org.apache.flink.streaming.runtime.tasks.mailbox.TaskMailboxImpl; import org.apache.flink.util.clock.SystemClock; -import org.apache.flink.shaded.guava32.com.google.common.io.Closer; +import org.apache.flink.shaded.guava31.com.google.common.io.Closer; import org.junit.Before; import org.junit.Test; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/recovery/DemultiplexingRecordDeserializerTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/recovery/DemultiplexingRecordDeserializerTest.java index d8d5dbc9771cf..a9383d0456bf6 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/recovery/DemultiplexingRecordDeserializerTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/recovery/DemultiplexingRecordDeserializerTest.java @@ -38,7 +38,7 @@ import org.apache.flink.streaming.runtime.streamrecord.StreamElementSerializer; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.After; import org.junit.Before; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/SinkV2SinkWriterOperatorDeprecatedTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/SinkV2SinkWriterOperatorDeprecatedTest.java index bf06065b17c86..f7fff71c53b30 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/SinkV2SinkWriterOperatorDeprecatedTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/SinkV2SinkWriterOperatorDeprecatedTest.java @@ -23,7 +23,7 @@ import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.streaming.runtime.operators.sink.deprecated.TestSinkV2; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; import java.io.IOException; import java.util.ArrayList; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/SinkV2SinkWriterOperatorTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/SinkV2SinkWriterOperatorTest.java index d46cf0c05fcb5..a9cd036269cde 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/SinkV2SinkWriterOperatorTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/SinkV2SinkWriterOperatorTest.java @@ -22,7 +22,7 @@ import org.apache.flink.api.connector.sink2.Sink; import org.apache.flink.api.java.tuple.Tuple3; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; import java.io.IOException; import java.util.ArrayList; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/TestSinkV2.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/TestSinkV2.java index e13e5881d71ba..2dc5cd73890c3 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/TestSinkV2.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/TestSinkV2.java @@ -40,7 +40,7 @@ import org.apache.flink.streaming.api.functions.sink.filesystem.bucketassigners.SimpleVersionedStringSerializer; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableSet; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableSet; import javax.annotation.Nullable; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollectorSerializerTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollectorSerializerTest.java index 944d7ce28c809..cda4f40d7db80 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollectorSerializerTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollectorSerializerTest.java @@ -29,7 +29,7 @@ import org.apache.flink.streaming.api.connector.sink2.IntegerSerializer; import org.apache.flink.streaming.api.connector.sink2.SinkV2Assertions; -import org.apache.flink.shaded.guava32.com.google.common.collect.Streams; +import org.apache.flink.shaded.guava31.com.google.common.collect.Streams; import org.apache.commons.lang3.tuple.Pair; import org.junit.jupiter.api.Test; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/deprecated/TestSinkV2.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/deprecated/TestSinkV2.java index 72b2810d1b4cb..7e84326cae192 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/deprecated/TestSinkV2.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/deprecated/TestSinkV2.java @@ -32,7 +32,7 @@ import org.apache.flink.streaming.api.functions.sink.filesystem.bucketassigners.SimpleVersionedStringSerializer; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableSet; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableSet; import javax.annotation.Nullable; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/ContinuousEventTimeTriggerTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/ContinuousEventTimeTriggerTest.java index 2d269aa8ad8c3..e6c7098566a8e 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/ContinuousEventTimeTriggerTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/ContinuousEventTimeTriggerTest.java @@ -25,7 +25,7 @@ import org.apache.flink.streaming.api.windowing.windows.TimeWindow; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.Test; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/CountTriggerTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/CountTriggerTest.java index 48db708b5e8f3..4af59a4460966 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/CountTriggerTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/CountTriggerTest.java @@ -23,7 +23,7 @@ import org.apache.flink.streaming.api.windowing.windows.TimeWindow; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.Test; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/DynamicEventTimeSessionWindowsTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/DynamicEventTimeSessionWindowsTest.java index 01e4ec401b885..a5a312e9ef7ca 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/DynamicEventTimeSessionWindowsTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/DynamicEventTimeSessionWindowsTest.java @@ -27,7 +27,7 @@ import org.apache.flink.streaming.api.windowing.windows.TimeWindow; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.Test; import org.mockito.Matchers; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/DynamicProcessingTimeSessionWindowsTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/DynamicProcessingTimeSessionWindowsTest.java index 19cd777ae6ddc..705d4f542cf8b 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/DynamicProcessingTimeSessionWindowsTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/DynamicProcessingTimeSessionWindowsTest.java @@ -27,7 +27,7 @@ import org.apache.flink.streaming.api.windowing.windows.TimeWindow; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.Test; import org.mockito.Matchers; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EventTimeSessionWindowsTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EventTimeSessionWindowsTest.java index 0ae9704610a26..31e908744e2f7 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EventTimeSessionWindowsTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EventTimeSessionWindowsTest.java @@ -29,7 +29,7 @@ import org.apache.flink.streaming.api.windowing.windows.TimeWindow; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.Test; import org.mockito.Matchers; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EventTimeTriggerTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EventTimeTriggerTest.java index e98a8333a063d..f05db7c0c3c68 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EventTimeTriggerTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EventTimeTriggerTest.java @@ -23,7 +23,7 @@ import org.apache.flink.streaming.api.windowing.windows.TimeWindow; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.Test; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java index 6282100675da1..542eef60eb96f 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java @@ -30,7 +30,7 @@ import org.apache.flink.streaming.api.windowing.triggers.Trigger; import org.apache.flink.streaming.api.windowing.windows.TimeWindow; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.Test; import org.mockito.Matchers; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/ProcessingTimeSessionWindowsTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/ProcessingTimeSessionWindowsTest.java index 4f4a6db0dd5e1..4702be4384f88 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/ProcessingTimeSessionWindowsTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/ProcessingTimeSessionWindowsTest.java @@ -29,7 +29,7 @@ import org.apache.flink.streaming.api.windowing.windows.TimeWindow; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.Test; import org.mockito.Matchers; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/ProcessingTimeTriggerTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/ProcessingTimeTriggerTest.java index 91396a86f3d27..84b41455f7bcc 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/ProcessingTimeTriggerTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/ProcessingTimeTriggerTest.java @@ -23,7 +23,7 @@ import org.apache.flink.streaming.api.windowing.windows.TimeWindow; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.Test; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorTest.java index 1cd3a5c8732f5..dd9710b39df79 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorTest.java @@ -70,8 +70,8 @@ import org.apache.flink.util.OutputTag; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.base.Joiner; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.base.Joiner; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.Assert; import org.junit.Test; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/SourceStreamTaskTestBase.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/SourceStreamTaskTestBase.java index ff0536de50b24..a075427362d9f 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/SourceStreamTaskTestBase.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/SourceStreamTaskTestBase.java @@ -30,7 +30,7 @@ import org.apache.flink.streaming.api.operators.StreamOperatorFactory; import org.apache.flink.util.function.FunctionWithException; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.assertj.core.api.AbstractDoubleAssert; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/SubtaskCheckpointCoordinatorTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/SubtaskCheckpointCoordinatorTest.java index dd1ce74ac8a63..2cba71b4e908f 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/SubtaskCheckpointCoordinatorTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/SubtaskCheckpointCoordinatorTest.java @@ -85,7 +85,7 @@ import java.util.function.Supplier; import static org.apache.flink.runtime.checkpoint.CheckpointType.CHECKPOINT; -import static org.apache.flink.shaded.guava32.com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; +import static org.apache.flink.shaded.guava31.com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; import static org.apache.flink.util.ExceptionUtils.findThrowable; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/TestHarnessUtil.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/TestHarnessUtil.java index 584f512e5171f..e3a0f49da5068 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/TestHarnessUtil.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/TestHarnessUtil.java @@ -22,7 +22,7 @@ import org.apache.flink.streaming.api.watermark.Watermark; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.Assert; diff --git a/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/CliClientITCase.java b/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/CliClientITCase.java index acff3ca23032e..1cb37239b5b0c 100644 --- a/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/CliClientITCase.java +++ b/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/CliClientITCase.java @@ -40,7 +40,7 @@ import org.apache.flink.test.junit5.MiniClusterExtension; import org.apache.flink.util.UserClassLoaderJarTestUtils; -import org.apache.flink.shaded.guava32.com.google.common.io.PatternFilenameFilter; +import org.apache.flink.shaded.guava31.com.google.common.io.PatternFilenameFilter; import org.apache.calcite.util.Util; import org.apache.commons.io.IOUtils; diff --git a/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/CliClientMultiStatementITTest.java b/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/CliClientMultiStatementITTest.java index c6158c7b6a1db..161e82379e3d0 100644 --- a/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/CliClientMultiStatementITTest.java +++ b/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/CliClientMultiStatementITTest.java @@ -22,7 +22,7 @@ import org.apache.flink.table.client.cli.utils.TestSqlStatement; import org.apache.flink.table.planner.utils.TableTestUtil; -import org.apache.flink.shaded.guava32.com.google.common.io.PatternFilenameFilter; +import org.apache.flink.shaded.guava31.com.google.common.io.PatternFilenameFilter; import org.apache.calcite.util.Util; diff --git a/flink-table/flink-sql-gateway/src/main/java/org/apache/flink/table/gateway/service/operation/OperationManager.java b/flink-table/flink-sql-gateway/src/main/java/org/apache/flink/table/gateway/service/operation/OperationManager.java index 26471450d1706..612fe1e5be377 100644 --- a/flink-table/flink-sql-gateway/src/main/java/org/apache/flink/table/gateway/service/operation/OperationManager.java +++ b/flink-table/flink-sql-gateway/src/main/java/org/apache/flink/table/gateway/service/operation/OperationManager.java @@ -34,7 +34,7 @@ import org.apache.flink.table.gateway.service.utils.SqlExecutionException; import org.apache.flink.util.IOUtils; -import org.apache.flink.shaded.guava32.com.google.common.util.concurrent.Uninterruptibles; +import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.Uninterruptibles; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-table/flink-sql-gateway/src/test/java/org/apache/flink/table/gateway/service/SqlGatewayServiceStatementITCase.java b/flink-table/flink-sql-gateway/src/test/java/org/apache/flink/table/gateway/service/SqlGatewayServiceStatementITCase.java index 3c5e7e97ecaf6..73a2df137cdff 100644 --- a/flink-table/flink-sql-gateway/src/test/java/org/apache/flink/table/gateway/service/SqlGatewayServiceStatementITCase.java +++ b/flink-table/flink-sql-gateway/src/test/java/org/apache/flink/table/gateway/service/SqlGatewayServiceStatementITCase.java @@ -36,7 +36,7 @@ import org.apache.flink.table.utils.DateTimeUtils; import org.apache.flink.testutils.junit.extensions.parameterized.Parameters; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheStats; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheStats; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/flink-table/flink-table-api-java-bridge/src/main/java/org/apache/flink/connector/datagen/table/SequenceGeneratorVisitor.java b/flink-table/flink-table-api-java-bridge/src/main/java/org/apache/flink/connector/datagen/table/SequenceGeneratorVisitor.java index c8d09e5286e1c..1bb6a33201d13 100644 --- a/flink-table/flink-table-api-java-bridge/src/main/java/org/apache/flink/connector/datagen/table/SequenceGeneratorVisitor.java +++ b/flink-table/flink-table-api-java-bridge/src/main/java/org/apache/flink/connector/datagen/table/SequenceGeneratorVisitor.java @@ -39,7 +39,7 @@ import org.apache.flink.table.types.logical.VarBinaryType; import org.apache.flink.table.types.logical.VarCharType; -import org.apache.flink.shaded.guava32.com.google.common.primitives.Longs; +import org.apache.flink.shaded.guava31.com.google.common.primitives.Longs; import static org.apache.flink.configuration.ConfigOptions.key; diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/internal/PlanCacheManager.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/internal/PlanCacheManager.java index 6a0d2f00063fa..14db7aa67049e 100644 --- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/internal/PlanCacheManager.java +++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/internal/PlanCacheManager.java @@ -21,9 +21,9 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava32.com.google.common.cache.Cache; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheBuilder; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheStats; +import org.apache.flink.shaded.guava31.com.google.common.cache.Cache; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheStats; import java.time.Duration; import java.util.Optional; diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/resource/ResourceManager.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/resource/ResourceManager.java index 1fd8fc839275f..6c6ded89ddda6 100644 --- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/resource/ResourceManager.java +++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/resource/ResourceManager.java @@ -33,7 +33,7 @@ import org.apache.flink.util.JarUtils; import org.apache.flink.util.MutableURLClassLoader; -import org.apache.flink.shaded.guava32.com.google.common.io.Files; +import org.apache.flink.shaded.guava31.com.google.common.io.Files; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/connector/source/lookup/cache/DefaultLookupCache.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/connector/source/lookup/cache/DefaultLookupCache.java index 10cc197e75c4f..01a27ab5d39b0 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/connector/source/lookup/cache/DefaultLookupCache.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/connector/source/lookup/cache/DefaultLookupCache.java @@ -27,9 +27,9 @@ import org.apache.flink.table.data.RowData; import org.apache.flink.util.clock.Clock; -import org.apache.flink.shaded.guava32.com.google.common.base.Ticker; -import org.apache.flink.shaded.guava32.com.google.common.cache.Cache; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheBuilder; +import org.apache.flink.shaded.guava31.com.google.common.base.Ticker; +import org.apache.flink.shaded.guava31.com.google.common.cache.Cache; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder; import javax.annotation.Nullable; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/functions/LegacyUserDefinedFunctionInference.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/functions/LegacyUserDefinedFunctionInference.java index 145ed11d05289..9114e532bb78e 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/functions/LegacyUserDefinedFunctionInference.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/functions/LegacyUserDefinedFunctionInference.java @@ -40,7 +40,7 @@ import org.apache.flink.table.types.utils.TypeConversions; import org.apache.flink.types.Row; -import org.apache.flink.shaded.guava32.com.google.common.primitives.Primitives; +import org.apache.flink.shaded.guava31.com.google.common.primitives.Primitives; import java.lang.reflect.Method; import java.lang.reflect.Modifier; diff --git a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/connector/source/TestManagedIterableSourceSplit.java b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/connector/source/TestManagedIterableSourceSplit.java index db8de37e91635..213804d1cec20 100644 --- a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/connector/source/TestManagedIterableSourceSplit.java +++ b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/connector/source/TestManagedIterableSourceSplit.java @@ -25,7 +25,7 @@ import org.apache.flink.table.data.StringData; import org.apache.flink.util.FlinkRuntimeException; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterators; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterators; import java.io.BufferedReader; import java.io.FileReader; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/analyze/FlinkStreamPlanAnalyzers.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/analyze/FlinkStreamPlanAnalyzers.java index 421fb775ba803..337e85168544e 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/analyze/FlinkStreamPlanAnalyzers.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/analyze/FlinkStreamPlanAnalyzers.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; import java.util.List; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/calcite/FlinkRelBuilder.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/calcite/FlinkRelBuilder.java index 71129e26d658e..b0a09d8bd3919 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/calcite/FlinkRelBuilder.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/calcite/FlinkRelBuilder.java @@ -37,7 +37,7 @@ import org.apache.flink.util.CollectionUtil; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; import org.apache.calcite.plan.Context; import org.apache.calcite.plan.Contexts; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/calcite/FlinkRexBuilder.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/calcite/FlinkRexBuilder.java index cff4fdc78fe59..7bd0902aa20c0 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/calcite/FlinkRexBuilder.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/calcite/FlinkRexBuilder.java @@ -18,7 +18,7 @@ package org.apache.flink.table.planner.calcite; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rel.type.RelDataTypeFactory; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlCumulateTableFunction.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlCumulateTableFunction.java index 23aba96047c9d..21909d3b13552 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlCumulateTableFunction.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlCumulateTableFunction.java @@ -17,7 +17,7 @@ package org.apache.flink.table.planner.functions.sql; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; import org.apache.calcite.sql.SqlCallBinding; import org.apache.calcite.sql.SqlOperator; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlFirstLastValueAggFunction.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlFirstLastValueAggFunction.java index 6524f2cef1fb9..ab71ef8722f8e 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlFirstLastValueAggFunction.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlFirstLastValueAggFunction.java @@ -20,7 +20,7 @@ import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rel.type.RelDataTypeFactory; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlHopTableFunction.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlHopTableFunction.java index da52b3548d119..253d31a981279 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlHopTableFunction.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlHopTableFunction.java @@ -17,7 +17,7 @@ package org.apache.flink.table.planner.functions.sql; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; import org.apache.calcite.sql.SqlCallBinding; import org.apache.calcite.sql.SqlKind; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlListAggFunction.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlListAggFunction.java index bd299c044c0cb..0bee9057aa54f 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlListAggFunction.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlListAggFunction.java @@ -18,7 +18,7 @@ package org.apache.flink.table.planner.functions.sql; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rel.type.RelDataTypeFactory; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlSessionTableFunction.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlSessionTableFunction.java index 5e5f62268f75a..454d1af689861 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlSessionTableFunction.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlSessionTableFunction.java @@ -17,8 +17,8 @@ package org.apache.flink.table.planner.functions.sql; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableMap; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.sql.SqlCallBinding; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlTumbleTableFunction.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlTumbleTableFunction.java index 8f599ed01bef9..b4f5466f1d4ea 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlTumbleTableFunction.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlTumbleTableFunction.java @@ -17,7 +17,7 @@ package org.apache.flink.table.planner.functions.sql; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; import org.apache.calcite.sql.SqlCallBinding; import org.apache.calcite.sql.SqlKind; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlWindowTableFunction.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlWindowTableFunction.java index 607a3bed2d3b8..0e7879a6dcce7 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlWindowTableFunction.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/sql/SqlWindowTableFunction.java @@ -22,7 +22,7 @@ import org.apache.flink.table.types.logical.LogicalType; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rel.type.RelDataTypeFactory; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/hint/FlinkHintStrategies.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/hint/FlinkHintStrategies.java index afdda70ce4185..bc60d8ec0c33d 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/hint/FlinkHintStrategies.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/hint/FlinkHintStrategies.java @@ -24,7 +24,7 @@ import org.apache.flink.table.planner.plan.rules.logical.WrapJsonAggFunctionArgumentsRule; import org.apache.flink.util.TimeUtils; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableSet; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableSet; import org.apache.calcite.rel.hint.HintOptionChecker; import org.apache.calcite.rel.hint.HintPredicates; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/hint/LookupJoinHintOptions.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/hint/LookupJoinHintOptions.java index c3448adfb6bf4..d1073b9231c39 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/hint/LookupJoinHintOptions.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/hint/LookupJoinHintOptions.java @@ -22,7 +22,7 @@ import org.apache.flink.configuration.ConfigOption; import org.apache.flink.table.api.config.ExecutionConfigOptions; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableSet; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableSet; import java.time.Duration; import java.util.HashSet; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/serde/JsonPlanGraph.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/serde/JsonPlanGraph.java index 53c82d6d9f837..a765609e5337c 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/serde/JsonPlanGraph.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/serde/JsonPlanGraph.java @@ -27,7 +27,7 @@ import org.apache.flink.table.planner.plan.nodes.exec.visitor.ExecNodeVisitor; import org.apache.flink.table.planner.plan.nodes.exec.visitor.ExecNodeVisitorImpl; -import org.apache.flink.shaded.guava32.com.google.common.collect.Sets; +import org.apache.flink.shaded.guava31.com.google.common.collect.Sets; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecIntervalJoin.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecIntervalJoin.java index e691d672c2948..35d39c6993e1b 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecIntervalJoin.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecIntervalJoin.java @@ -57,7 +57,7 @@ import org.apache.flink.table.types.logical.RowType; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecJoin.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecJoin.java index dbeb4a5dc9805..48df18ab0dedb 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecJoin.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecJoin.java @@ -49,7 +49,7 @@ import org.apache.flink.table.runtime.typeutils.InternalTypeInfo; import org.apache.flink.table.types.logical.RowType; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonInclude; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecWindowJoin.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecWindowJoin.java index 3f0bc5be8ea9d..80314f3a04f54 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecWindowJoin.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecWindowJoin.java @@ -48,7 +48,7 @@ import org.apache.flink.table.runtime.util.TimeWindowUtil; import org.apache.flink.table.types.logical.RowType; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateJoinTransposeRule.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateJoinTransposeRule.java index f1700ef4acfe7..d697e6de8aa71 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateJoinTransposeRule.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateJoinTransposeRule.java @@ -20,7 +20,7 @@ import org.apache.flink.table.planner.plan.utils.AggregateUtil; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; import org.apache.calcite.linq4j.Ord; import org.apache.calcite.plan.RelOptRule; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkSemiAntiJoinFilterTransposeRule.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkSemiAntiJoinFilterTransposeRule.java index 0ab040b2693f1..34a66c6689fde 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkSemiAntiJoinFilterTransposeRule.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkSemiAntiJoinFilterTransposeRule.java @@ -17,7 +17,7 @@ package org.apache.flink.table.planner.plan.rules.logical; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableSet; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableSet; import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.plan.RelOptRuleCall; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/schema/FlinkPreparingTableBase.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/schema/FlinkPreparingTableBase.java index 734b0a5ec0a26..8e00d3919416f 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/schema/FlinkPreparingTableBase.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/schema/FlinkPreparingTableBase.java @@ -22,9 +22,9 @@ import org.apache.flink.table.planner.plan.stats.FlinkStatistic; import org.apache.flink.table.sources.TableSource; -import org.apache.flink.shaded.guava32.com.google.common.base.Strings; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableSet; +import org.apache.flink.shaded.guava31.com.google.common.base.Strings; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableSet; import org.apache.calcite.linq4j.tree.Expression; import org.apache.calcite.plan.RelOptSchema; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/utils/RelDescriptionWriterImpl.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/utils/RelDescriptionWriterImpl.java index ef5f88715badc..0117f606ccec7 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/utils/RelDescriptionWriterImpl.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/utils/RelDescriptionWriterImpl.java @@ -20,7 +20,7 @@ import org.apache.flink.table.planner.plan.nodes.FlinkRelNode; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.RelWriter; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/utils/Expander.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/utils/Expander.java index 3cf6487e6d6ad..9b0685c8ce958 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/utils/Expander.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/utils/Expander.java @@ -21,7 +21,7 @@ import org.apache.flink.table.planner.calcite.FlinkPlannerImpl; import org.apache.flink.table.planner.functions.bridging.BridgingSqlFunction; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableMap; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap; import org.apache.calcite.sql.SqlCall; import org.apache.calcite.sql.SqlIdentifier; diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/schema/LegacyTableSourceTable.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/schema/LegacyTableSourceTable.scala index 9fa914f44b00f..4602c8cbc4b26 100644 --- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/schema/LegacyTableSourceTable.scala +++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/schema/LegacyTableSourceTable.scala @@ -17,7 +17,7 @@ */ package org.apache.flink.table.planner.plan.schema -import org.apache.flink.shaded.guava32.com.google.common.base.Preconditions +import org.apache.flink.shaded.guava31.com.google.common.base.Preconditions import org.apache.flink.table.catalog.{CatalogTable, ObjectIdentifier} import org.apache.flink.table.planner.JMap import org.apache.flink.table.planner.calcite.FlinkTypeFactory diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/catalog/CatalogConstraintTest.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/catalog/CatalogConstraintTest.java index 4d5d96e03b7e4..d792812791e7c 100644 --- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/catalog/CatalogConstraintTest.java +++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/catalog/CatalogConstraintTest.java @@ -31,7 +31,7 @@ import org.apache.flink.table.planner.plan.metadata.FlinkRelMetadataQuery; import org.apache.flink.table.planner.utils.TableTestUtil; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableSet; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableSet; import org.apache.calcite.rel.RelNode; import org.apache.calcite.util.ImmutableBitSet; diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/serde/AggregateCallSerdeTest.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/serde/AggregateCallSerdeTest.java index 53b8e500ca94a..8678ba37f7d95 100644 --- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/serde/AggregateCallSerdeTest.java +++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/serde/AggregateCallSerdeTest.java @@ -34,7 +34,7 @@ import org.apache.flink.table.types.logical.LogicalType; import org.apache.flink.table.types.utils.TypeConversions; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; import org.apache.calcite.rel.RelCollations; import org.apache.calcite.rel.core.AggregateCall; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/formats/raw/RawFormatFactory.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/formats/raw/RawFormatFactory.java index 3d9203c760aea..b1258254e86ba 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/formats/raw/RawFormatFactory.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/formats/raw/RawFormatFactory.java @@ -40,7 +40,7 @@ import org.apache.flink.table.types.logical.LogicalTypeRoot; import org.apache.flink.table.types.logical.RowType; -import org.apache.flink.shaded.guava32.com.google.common.collect.Sets; +import org.apache.flink.shaded.guava31.com.google.common.collect.Sets; import java.nio.charset.Charset; import java.util.Collections; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/functions/JsonPathCache.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/functions/JsonPathCache.java index 1b8ed98821b9c..c66f99a75ebb9 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/functions/JsonPathCache.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/functions/JsonPathCache.java @@ -17,7 +17,7 @@ package org.apache.flink.table.runtime.functions; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheBuilder; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder; import com.jayway.jsonpath.JsonPath; import com.jayway.jsonpath.spi.cache.Cache; @@ -27,7 +27,7 @@ public class JsonPathCache implements Cache { private static final long DEFAULT_CACHE_MAXIMUM_SIZE = 400; - private final org.apache.flink.shaded.guava32.com.google.common.cache.Cache + private final org.apache.flink.shaded.guava31.com.google.common.cache.Cache jsonPathCache = CacheBuilder.newBuilder().maximumSize(DEFAULT_CACHE_MAXIMUM_SIZE).build(); diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/functions/table/lookup/fullcache/CacheLoader.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/functions/table/lookup/fullcache/CacheLoader.java index 5803f3b1a7f47..cf76a503db9de 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/functions/table/lookup/fullcache/CacheLoader.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/functions/table/lookup/fullcache/CacheLoader.java @@ -25,7 +25,7 @@ import org.apache.flink.table.connector.source.ScanTableSource.ScanRuntimeProvider; import org.apache.flink.table.data.RowData; -import org.apache.flink.shaded.guava32.com.google.common.base.Joiner; +import org.apache.flink.shaded.guava31.com.google.common.base.Joiner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/generated/CompileUtils.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/generated/CompileUtils.java index e155cdbd38df7..93d21fe05e9b5 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/generated/CompileUtils.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/generated/CompileUtils.java @@ -21,8 +21,8 @@ import org.apache.flink.api.common.InvalidProgramException; import org.apache.flink.util.FlinkRuntimeException; -import org.apache.flink.shaded.guava32.com.google.common.cache.Cache; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheBuilder; +import org.apache.flink.shaded.guava31.com.google.common.cache.Cache; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder; import org.codehaus.commons.compiler.CompileException; import org.codehaus.janino.ExpressionEvaluator; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/AppendOnlyTopNFunction.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/AppendOnlyTopNFunction.java index 98b4e5a955546..6c26740a42d73 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/AppendOnlyTopNFunction.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/AppendOnlyTopNFunction.java @@ -31,8 +31,8 @@ import org.apache.flink.table.runtime.typeutils.InternalTypeInfo; import org.apache.flink.util.Collector; -import org.apache.flink.shaded.guava32.com.google.common.cache.Cache; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheBuilder; +import org.apache.flink.shaded.guava31.com.google.common.cache.Cache; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/FastTop1Function.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/FastTop1Function.java index 7a947b81908b5..44054a5509bc9 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/FastTop1Function.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/FastTop1Function.java @@ -33,11 +33,11 @@ import org.apache.flink.table.runtime.typeutils.InternalTypeInfo; import org.apache.flink.util.Collector; -import org.apache.flink.shaded.guava32.com.google.common.cache.Cache; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheBuilder; -import org.apache.flink.shaded.guava32.com.google.common.cache.RemovalCause; -import org.apache.flink.shaded.guava32.com.google.common.cache.RemovalListener; -import org.apache.flink.shaded.guava32.com.google.common.cache.RemovalNotification; +import org.apache.flink.shaded.guava31.com.google.common.cache.Cache; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder; +import org.apache.flink.shaded.guava31.com.google.common.cache.RemovalCause; +import org.apache.flink.shaded.guava31.com.google.common.cache.RemovalListener; +import org.apache.flink.shaded.guava31.com.google.common.cache.RemovalNotification; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/UpdatableTopNFunction.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/UpdatableTopNFunction.java index a2009680cd93e..919ca9b518abd 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/UpdatableTopNFunction.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/UpdatableTopNFunction.java @@ -39,11 +39,11 @@ import org.apache.flink.table.runtime.typeutils.InternalTypeInfo; import org.apache.flink.util.Collector; -import org.apache.flink.shaded.guava32.com.google.common.cache.Cache; -import org.apache.flink.shaded.guava32.com.google.common.cache.CacheBuilder; -import org.apache.flink.shaded.guava32.com.google.common.cache.RemovalCause; -import org.apache.flink.shaded.guava32.com.google.common.cache.RemovalListener; -import org.apache.flink.shaded.guava32.com.google.common.cache.RemovalNotification; +import org.apache.flink.shaded.guava31.com.google.common.cache.Cache; +import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder; +import org.apache.flink.shaded.guava31.com.google.common.cache.RemovalCause; +import org.apache.flink.shaded.guava31.com.google.common.cache.RemovalListener; +import org.apache.flink.shaded.guava31.com.google.common.cache.RemovalNotification; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/tvf/slicing/SliceAssignerTestBase.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/tvf/slicing/SliceAssignerTestBase.java index 4ecd2fc7a8920..3f7514ce8dd57 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/tvf/slicing/SliceAssignerTestBase.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/tvf/slicing/SliceAssignerTestBase.java @@ -25,7 +25,7 @@ import org.apache.flink.table.runtime.operators.window.MergeCallback; import org.apache.flink.table.runtime.operators.window.tvf.common.ClockService; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import java.time.Instant; import java.time.LocalDateTime; diff --git a/flink-test-utils-parent/flink-connector-test-utils/src/main/java/org/apache/flink/connector/testframe/container/FlinkContainers.java b/flink-test-utils-parent/flink-connector-test-utils/src/main/java/org/apache/flink/connector/testframe/container/FlinkContainers.java index d47a4d09c9f52..c99c2bb327a22 100644 --- a/flink-test-utils-parent/flink-connector-test-utils/src/main/java/org/apache/flink/connector/testframe/container/FlinkContainers.java +++ b/flink-test-utils-parent/flink-connector-test-utils/src/main/java/org/apache/flink/connector/testframe/container/FlinkContainers.java @@ -34,7 +34,7 @@ import org.apache.flink.test.util.SQLJobSubmission; import org.apache.flink.util.function.RunnableWithException; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.jupiter.api.extension.AfterAllCallback; import org.junit.jupiter.api.extension.BeforeAllCallback; diff --git a/flink-test-utils-parent/flink-connector-test-utils/src/main/java/org/apache/flink/connector/testframe/container/FlinkTestcontainersConfigurator.java b/flink-test-utils-parent/flink-connector-test-utils/src/main/java/org/apache/flink/connector/testframe/container/FlinkTestcontainersConfigurator.java index ed44836f59b08..10353d2ee1cd7 100644 --- a/flink-test-utils-parent/flink-connector-test-utils/src/main/java/org/apache/flink/connector/testframe/container/FlinkTestcontainersConfigurator.java +++ b/flink-test-utils-parent/flink-connector-test-utils/src/main/java/org/apache/flink/connector/testframe/container/FlinkTestcontainersConfigurator.java @@ -107,7 +107,7 @@ private List> configureTaskManagerContainers(Path tempDirect private GenericContainer configureZookeeperContainer() { return configureContainer( - new GenericContainer<>(DockerImageName.parse("zookeeper").withTag("3.7.2")), + new GenericContainer<>(DockerImageName.parse("zookeeper").withTag("3.7.1")), flinkContainersSettings.getZookeeperHostname(), "Zookeeper"); } diff --git a/flink-test-utils-parent/flink-connector-test-utils/src/main/java/org/apache/flink/connector/testframe/utils/UnorderedCollectIteratorAssert.java b/flink-test-utils-parent/flink-connector-test-utils/src/main/java/org/apache/flink/connector/testframe/utils/UnorderedCollectIteratorAssert.java index f561660147db9..de5b749396cba 100644 --- a/flink-test-utils-parent/flink-connector-test-utils/src/main/java/org/apache/flink/connector/testframe/utils/UnorderedCollectIteratorAssert.java +++ b/flink-test-utils-parent/flink-connector-test-utils/src/main/java/org/apache/flink/connector/testframe/utils/UnorderedCollectIteratorAssert.java @@ -28,7 +28,7 @@ import java.util.Set; import static java.util.stream.Collectors.toSet; -import static org.apache.flink.shaded.guava32.com.google.common.base.Predicates.not; +import static org.apache.flink.shaded.guava31.com.google.common.base.Predicates.not; import static org.junit.jupiter.api.Assertions.assertTrue; /** diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/ChangelogRecoveryITCaseBase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/ChangelogRecoveryITCaseBase.java index 9702041999dc7..b5bc898954a9e 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/ChangelogRecoveryITCaseBase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/ChangelogRecoveryITCaseBase.java @@ -94,7 +94,7 @@ import java.util.stream.Stream; import static org.apache.flink.runtime.testutils.CommonTestUtils.getLatestCompletedCheckpointPath; -import static org.apache.flink.shaded.guava32.com.google.common.collect.Iterables.get; +import static org.apache.flink.shaded.guava31.com.google.common.collect.Iterables.get; import static org.apache.flink.test.util.TestUtils.loadCheckpointMetadata; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UdfStreamOperatorCheckpointingITCase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UdfStreamOperatorCheckpointingITCase.java index 09f4d819b72ef..c67405897170f 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UdfStreamOperatorCheckpointingITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UdfStreamOperatorCheckpointingITCase.java @@ -31,7 +31,7 @@ import org.apache.flink.streaming.api.operators.AbstractUdfStreamOperator; import org.apache.flink.streaming.api.operators.StreamGroupedReduceOperator; -import org.apache.flink.shaded.guava32.com.google.common.collect.EvictingQueue; +import org.apache.flink.shaded.guava31.com.google.common.collect.EvictingQueue; import org.junit.Assert; 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 26fad8be5474a..effbbc52fc81d 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 @@ -53,7 +53,7 @@ import java.util.stream.Stream; import static org.apache.flink.api.common.eventtime.WatermarkStrategy.noWatermarks; -import static org.apache.flink.shaded.guava32.com.google.common.collect.Iterables.getOnlyElement; +import static org.apache.flink.shaded.guava31.com.google.common.collect.Iterables.getOnlyElement; import static org.apache.flink.test.checkpointing.UnalignedCheckpointTestBase.ChannelType.LOCAL; import static org.apache.flink.test.checkpointing.UnalignedCheckpointTestBase.ChannelType.MIXED; import static org.apache.flink.test.checkpointing.UnalignedCheckpointTestBase.ChannelType.REMOTE; diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointStressITCase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointStressITCase.java index 93a12937f407d..d7f73e586c5e6 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointStressITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointStressITCase.java @@ -88,7 +88,7 @@ import static org.apache.flink.configuration.CheckpointingOptions.CHECKPOINTS_DIRECTORY; import static org.apache.flink.configuration.CheckpointingOptions.MAX_RETAINED_CHECKPOINTS; import static org.apache.flink.shaded.curator5.org.apache.curator.shaded.com.google.common.base.Preconditions.checkState; -import static org.apache.flink.shaded.guava32.com.google.common.collect.Iterables.getOnlyElement; +import static org.apache.flink.shaded.guava31.com.google.common.collect.Iterables.getOnlyElement; import static org.apache.flink.test.util.TestUtils.submitJobAndWaitForResult; /** diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointTestBase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointTestBase.java index 80084bc3fbc73..ea664da1772be 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointTestBase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointTestBase.java @@ -70,7 +70,7 @@ import org.apache.flink.util.TestLogger; import org.apache.flink.util.concurrent.FutureUtils; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -100,7 +100,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import static org.apache.flink.shaded.guava32.com.google.common.collect.Iterables.getOnlyElement; +import static org.apache.flink.shaded.guava31.com.google.common.collect.Iterables.getOnlyElement; import static org.apache.flink.streaming.api.environment.ExecutionCheckpointingOptions.CHECKPOINTING_TIMEOUT; import static org.apache.flink.util.Preconditions.checkState; diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/CancellingIntegerSource.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/CancellingIntegerSource.java index a47b57111bdb2..2ded0cd772945 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/CancellingIntegerSource.java +++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/CancellingIntegerSource.java @@ -29,7 +29,7 @@ import javax.annotation.Nullable; import static java.util.Collections.singletonList; -import static org.apache.flink.shaded.guava32.com.google.common.collect.Iterables.getOnlyElement; +import static org.apache.flink.shaded.guava31.com.google.common.collect.Iterables.getOnlyElement; import static org.apache.flink.util.Preconditions.checkArgument; import static org.apache.flink.util.Preconditions.checkState; diff --git a/flink-tests/src/test/java/org/apache/flink/test/plugin/DefaultPluginManagerTest.java b/flink-tests/src/test/java/org/apache/flink/test/plugin/DefaultPluginManagerTest.java index c02d2b5e6fef6..11c6fcaf4726a 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/plugin/DefaultPluginManagerTest.java +++ b/flink-tests/src/test/java/org/apache/flink/test/plugin/DefaultPluginManagerTest.java @@ -26,7 +26,7 @@ import org.apache.flink.test.plugin.jar.pluginb.TestServiceB; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.Before; import org.junit.Rule; diff --git a/flink-tests/src/test/java/org/apache/flink/test/recovery/ClusterEntrypointITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recovery/ClusterEntrypointITCase.java index a2b8a358061fb..3c644567e836d 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/recovery/ClusterEntrypointITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/recovery/ClusterEntrypointITCase.java @@ -28,7 +28,7 @@ import org.apache.flink.test.util.TestProcessBuilder; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.ClassRule; import org.junit.Test; diff --git a/flink-tests/src/test/java/org/apache/flink/test/recovery/TaskManagerRunnerITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recovery/TaskManagerRunnerITCase.java index 0fe8f4d5f7c6f..6d8172460f584 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/recovery/TaskManagerRunnerITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/recovery/TaskManagerRunnerITCase.java @@ -31,7 +31,7 @@ import org.apache.flink.test.util.TestProcessBuilder; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.junit.ClassRule; import org.junit.Test; diff --git a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/IntervalJoinITCase.java b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/IntervalJoinITCase.java index eeecbef0ae04a..247281d2c066b 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/IntervalJoinITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/IntervalJoinITCase.java @@ -31,7 +31,7 @@ import org.apache.flink.streaming.api.windowing.time.Time; import org.apache.flink.util.Collector; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.junit.Assert; import org.junit.Before; diff --git a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/SinkV2MetricsDeprecatedITCase.java b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/SinkV2MetricsDeprecatedITCase.java index 3dea88bcf65c3..e46822b745c17 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/SinkV2MetricsDeprecatedITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/SinkV2MetricsDeprecatedITCase.java @@ -37,7 +37,7 @@ import org.apache.flink.testutils.junit.SharedReference; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableMap; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap; import org.junit.Rule; import org.junit.Test; diff --git a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/SinkV2MetricsITCase.java b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/SinkV2MetricsITCase.java index 4fd5a2e577071..402058226b275 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/SinkV2MetricsITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/SinkV2MetricsITCase.java @@ -37,7 +37,7 @@ import org.apache.flink.testutils.junit.SharedReference; import org.apache.flink.util.TestLogger; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableMap; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap; import org.junit.Rule; import org.junit.Test; diff --git a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNHighAvailabilityITCase.java b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNHighAvailabilityITCase.java index 4eda04771cd8e..abb660548c941 100644 --- a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNHighAvailabilityITCase.java +++ b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNHighAvailabilityITCase.java @@ -46,7 +46,7 @@ import org.apache.flink.yarn.testjob.YarnTestJob; import org.apache.flink.yarn.util.TestUtils; -import org.apache.flink.shaded.guava32.com.google.common.collect.Iterables; +import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; diff --git a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java index 6738c55c5e680..86ff787032bf1 100644 --- a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java +++ b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java @@ -39,7 +39,7 @@ import org.apache.flink.yarn.configuration.YarnConfigOptions; import org.apache.flink.yarn.util.TestUtils; -import org.apache.flink.shaded.guava32.com.google.common.net.HostAndPort; +import org.apache.flink.shaded.guava31.com.google.common.net.HostAndPort; import org.apache.commons.io.FileUtils; import org.apache.hadoop.yarn.api.records.ApplicationId; diff --git a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionFIFOSecuredITCase.java b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionFIFOSecuredITCase.java index 8214887eaaef3..a91fb43c466b8 100644 --- a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionFIFOSecuredITCase.java +++ b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionFIFOSecuredITCase.java @@ -28,7 +28,7 @@ import org.apache.flink.yarn.configuration.YarnConfigOptions; import org.apache.flink.yarn.util.TestHadoopModuleFactory; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.apache.hadoop.yarn.api.records.ApplicationAccessType; import org.apache.hadoop.yarn.api.records.ApplicationId; diff --git a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/testjob/YarnTestArchiveJob.java b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/testjob/YarnTestArchiveJob.java index 57086526cb342..1db17ba2f9bcb 100644 --- a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/testjob/YarnTestArchiveJob.java +++ b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/testjob/YarnTestArchiveJob.java @@ -28,7 +28,7 @@ import org.apache.flink.streaming.api.functions.source.RichSourceFunction; import org.apache.flink.yarn.configuration.YarnConfigOptions; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; diff --git a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/testjob/YarnTestCacheJob.java b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/testjob/YarnTestCacheJob.java index 6bb50881d7f25..1c9451bfb0a00 100644 --- a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/testjob/YarnTestCacheJob.java +++ b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/testjob/YarnTestCacheJob.java @@ -27,7 +27,7 @@ import org.apache.flink.streaming.api.functions.sink.v2.DiscardingSink; import org.apache.flink.streaming.api.functions.source.SourceFunction; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; import java.io.File; import java.io.FileInputStream; diff --git a/flink-yarn/src/test/java/org/apache/flink/yarn/YarnApplicationFileUploaderTest.java b/flink-yarn/src/test/java/org/apache/flink/yarn/YarnApplicationFileUploaderTest.java index b36abf0c72b3d..5594c880a9fb3 100644 --- a/flink-yarn/src/test/java/org/apache/flink/yarn/YarnApplicationFileUploaderTest.java +++ b/flink-yarn/src/test/java/org/apache/flink/yarn/YarnApplicationFileUploaderTest.java @@ -22,7 +22,7 @@ import org.apache.flink.util.IOUtils; import org.apache.flink.yarn.configuration.YarnConfigOptions; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableMap; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.LocalFileSystem; diff --git a/flink-yarn/src/test/java/org/apache/flink/yarn/YarnFileStageTest.java b/flink-yarn/src/test/java/org/apache/flink/yarn/YarnFileStageTest.java index a33bb94b1ea0b..83c975cddd886 100644 --- a/flink-yarn/src/test/java/org/apache/flink/yarn/YarnFileStageTest.java +++ b/flink-yarn/src/test/java/org/apache/flink/yarn/YarnFileStageTest.java @@ -20,7 +20,7 @@ import org.apache.flink.util.OperatingSystem; -import org.apache.flink.shaded.guava32.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileSystem; diff --git a/flink-yarn/src/test/java/org/apache/flink/yarn/YarnResourceManagerDriverTest.java b/flink-yarn/src/test/java/org/apache/flink/yarn/YarnResourceManagerDriverTest.java index c45ff641d620a..4d36550f5673e 100644 --- a/flink-yarn/src/test/java/org/apache/flink/yarn/YarnResourceManagerDriverTest.java +++ b/flink-yarn/src/test/java/org/apache/flink/yarn/YarnResourceManagerDriverTest.java @@ -32,7 +32,7 @@ import org.apache.flink.util.ExceptionUtils; import org.apache.flink.yarn.configuration.YarnResourceManagerDriverConfiguration; -import org.apache.flink.shaded.guava32.com.google.common.collect.ImmutableList; +import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableList; import org.apache.hadoop.fs.Path; import org.apache.hadoop.yarn.api.ApplicationConstants; diff --git a/pom.xml b/pom.xml index 9c20d806d7758..e8f5d1639ea2b 100644 --- a/pom.xml +++ b/pom.xml @@ -122,8 +122,8 @@ under the License. 4 true -XX:+UseG1GC -Xms256m -XX:+IgnoreUnrecognizedVMOptions ${surefire.module.config} - 18.0 - 2.15.3 + 17.0 + 2.14.2 true 1.8 1.7.36 @@ -140,7 +140,7 @@ under the License. 2.12 0.7.6 - 3.7.2 + 3.7.1 5.4.0 @@ -335,13 +335,13 @@ under the License. org.apache.flink flink-shaded-asm-9 - 9.6-${flink.shaded.version} + 9.5-${flink.shaded.version} org.apache.flink flink-shaded-guava - 32.1.3-jre-${flink.shaded.version} + 31.1-jre-${flink.shaded.version} @@ -359,13 +359,13 @@ under the License. org.apache.flink flink-shaded-netty - 4.1.100.Final-${flink.shaded.version} + 4.1.91.Final-${flink.shaded.version} org.apache.flink flink-shaded-netty-tcnative-dynamic - 2.0.62.Final-${flink.shaded.version} + 2.0.59.Final-${flink.shaded.version} test