Revert "[FLINK-33705] Upgrade to flink-shaded 18.0"

flink-architecture-tests/flink-architecture-tests-production/archunit-violations/f7a4e6fa-e7de-48c9-a61e-c13e83f0c72e

@@ -340,7 +340,7 @@ Method <org.apache.flink.connector.datagen.table.RandomGeneratorVisitor.visit(or
 Method <org.apache.flink.connector.datagen.table.RandomGeneratorVisitor.visit(org.apache.flink.table.types.logical.YearMonthIntervalType)> calls method <org.apache.flink.streaming.api.functions.source.datagen.RandomGenerator.intGenerator(int, int)> in (RandomGeneratorVisitor.java:292)
 Method <org.apache.flink.connector.datagen.table.RandomGeneratorVisitor.visit(org.apache.flink.table.types.logical.YearMonthIntervalType)> calls method <org.apache.flink.streaming.api.functions.source.datagen.RandomGenerator.withNullRate(float)> in (RandomGeneratorVisitor.java:293)
 Method <org.apache.flink.connector.datagen.table.RandomGeneratorVisitor.visit(org.apache.flink.table.types.logical.ZonedTimestampType)> calls method <org.apache.flink.streaming.api.functions.source.datagen.RandomGenerator.withNullRate(float)> in (RandomGeneratorVisitor.java:331)
-Method <org.apache.flink.connector.datagen.table.SequenceGeneratorVisitor$2.next()> calls method <org.apache.flink.shaded.guava32.com.google.common.primitives.Longs.toByteArray(long)> in (SequenceGeneratorVisitor.java:221)
+Method <org.apache.flink.connector.datagen.table.SequenceGeneratorVisitor$2.next()> calls method <org.apache.flink.shaded.guava31.com.google.common.primitives.Longs.toByteArray(long)> in (SequenceGeneratorVisitor.java:221)
 Method <org.apache.flink.connector.datagen.table.SequenceGeneratorVisitor.getSequenceBytesGenerator(long, long)> has return type <org.apache.flink.streaming.api.functions.source.datagen.SequenceGenerator> in (SequenceGeneratorVisitor.java:0)
 Method <org.apache.flink.connector.datagen.table.SequenceGeneratorVisitor.getSequenceStringGenerator(long, long)> has return type <org.apache.flink.streaming.api.functions.source.datagen.SequenceGenerator> in (SequenceGeneratorVisitor.java:0)
 Method <org.apache.flink.connector.datagen.table.SequenceGeneratorVisitor.visit(org.apache.flink.table.types.logical.BigIntType)> calls method <org.apache.flink.streaming.api.functions.source.datagen.SequenceGenerator.longGenerator(long, long)> in (SequenceGeneratorVisitor.java:172)

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;

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

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;

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;

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 {

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;

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;

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;

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;

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;

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;

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

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;

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;
 

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;

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;
 

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;

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;

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

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

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;

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;

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);

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;

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;
 

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;
 

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;

flink-dist/pom.xml

@@ -52,40 +52,6 @@ under the License.
 			<artifactId>flink-core</artifactId>
 			<version>${project.version}</version>
 			<optional>${flink.markBundledAsOptional}</optional>
-			<exclusions>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.core</groupId>
-					<artifactId>jackson-core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.core</groupId>
-					<artifactId>jackson-annotations</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.core</groupId>
-					<artifactId>jackson-databind</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.dataformat</groupId>
-					<artifactId>jackson-dataformat-yaml</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.dataformat</groupId>
-					<artifactId>jackson-dataformat-csv</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.datatype</groupId>
-					<artifactId>jackson-datatype-jsr310</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.datatype</groupId>
-					<artifactId>jackson-datatype-jdk8</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.yaml</groupId>
-					<artifactId>snakeyaml</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 
 		<dependency>

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;

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;

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;

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;

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;

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;

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;