Replace guava32 with guava31 in newly added usages

snuyanzin · Feb 1, 2024 · 6d0c4f7 · 6d0c4f7
1 parent 80ae6ca
commit 6d0c4f7
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/.../main/java/org/apache/flink/runtime/io/network/partition/UnionResultSubpartitionView.java b/.../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/...main/java/org/apache/flink/streaming/api/transformations/SourceTransformationWrapper.java b/...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/...apache/flink/streaming/runtime/operators/sink/SinkV2SinkWriterOperatorDeprecatedTest.java b/...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/...rc/test/java/org/apache/flink/streaming/runtime/operators/sink/deprecated/TestSinkV2.java b/...rc/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/...r/src/main/java/org/apache/flink/table/planner/functions/sql/SqlSessionTableFunction.java b/...r/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/.../src/test/java/org/apache/flink/test/streaming/runtime/SinkV2MetricsDeprecatedITCase.java b/.../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;