This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-paimon.git
The following commit(s) were added to refs/heads/master by this push:
new 35db44b94 [deps] Use paimon-shade dependencies (#838)
35db44b94 is described below
commit 35db44b94e911bee31aa58f472574fab6df5b1f0
Author: Jingsong Lee <[email protected]>
AuthorDate: Thu Apr 6 10:24:13 2023 +0800
[deps] Use paimon-shade dependencies (#838)
---
paimon-benchmark/paimon-cluster-benchmark/pom.xml | 6 +++++
.../paimon/benchmark/metric/FlinkRestClient.java | 4 +--
.../paimon/benchmark/metric/cpu/CpuMetric.java | 15 +++++------
.../paimon/benchmark/utils/BenchmarkUtils.java | 5 ++--
paimon-bundle/pom.xml | 26 +++++++++----------
paimon-common/pom.xml | 18 ++++++++-----
.../org/apache/paimon/codegen/CompileUtils.java | 5 ++--
.../org/apache/paimon/io/cache/CacheManager.java | 7 +++--
.../apache/paimon/plugin/ComponentClassLoader.java | 3 +--
.../java/org/apache/paimon/types/ArrayType.java | 3 +--
.../java/org/apache/paimon/types/DataField.java | 3 +--
.../java/org/apache/paimon/types/DataType.java | 3 +--
.../apache/paimon/types/DataTypeJsonParser.java | 2 +-
.../main/java/org/apache/paimon/types/MapType.java | 3 +--
.../java/org/apache/paimon/types/MultisetType.java | 3 +--
.../main/java/org/apache/paimon/types/RowType.java | 3 +--
paimon-core/pom.xml | 10 ++++----
.../src/main/java/org/apache/paimon/Snapshot.java | 7 +++--
.../org/apache/paimon/mergetree/LookupLevels.java | 7 +++--
.../paimon/operation/FileStoreExpireImpl.java | 2 +-
.../paimon/operation/MemoryFileStoreWrite.java | 3 +--
.../apache/paimon/predicate/BucketSelector.java | 3 +--
.../org/apache/paimon/schema/SchemaSerializer.java | 5 ++--
.../apache/paimon/table/system/AuditLogTable.java | 3 +--
.../org/apache/paimon/table/system/FilesTable.java | 3 +--
.../apache/paimon/table/system/OptionsTable.java | 3 +--
.../apache/paimon/table/system/SchemasTable.java | 3 +--
.../apache/paimon/table/system/SnapshotsTable.java | 3 +--
.../org/apache/paimon/utils/JsonDeserializer.java | 2 +-
.../org/apache/paimon/utils/JsonSerdeUtil.java | 21 ++++++++-------
.../org/apache/paimon/utils/JsonSerializer.java | 2 +-
.../org/apache/paimon/flink/CatalogITCaseBase.java | 2 +-
.../paimon/flink/ContinuousFileStoreITCase.java | 2 +-
.../org/apache/paimon/flink/CatalogITCaseBase.java | 2 +-
.../paimon/flink/ContinuousFileStoreITCase.java | 2 +-
paimon-flink/paimon-flink-common/pom.xml | 9 +------
.../cdc/mysql/MySqlDebeziumJsonEventParser.java | 6 ++---
.../flink/lookup/FileStoreLookupFunction.java | 2 +-
.../apache/paimon/flink/lookup/RocksDBState.java | 4 +--
.../paimon/flink/lookup/TableStreamingReader.java | 5 ++--
.../org/apache/paimon/flink/CatalogITCaseBase.java | 2 +-
.../paimon/flink/ContinuousFileStoreITCase.java | 2 +-
.../apache/paimon/flink/MappingTableITCase.java | 2 +-
paimon-flink/pom.xml | 30 +---------------------
.../hive/runner/PaimonEmbeddedHiveRunner.java | 2 +-
pom.xml | 7 +++--
tools/maven/checkstyle.xml | 12 ++-------
47 files changed, 113 insertions(+), 164 deletions(-)
diff --git a/paimon-benchmark/paimon-cluster-benchmark/pom.xml
b/paimon-benchmark/paimon-cluster-benchmark/pom.xml
index 2ae604006..481b25ce0 100644
--- a/paimon-benchmark/paimon-cluster-benchmark/pom.xml
+++ b/paimon-benchmark/paimon-cluster-benchmark/pom.xml
@@ -32,6 +32,12 @@ under the License.
<name>Paimon : Benchmark : Cluster</name>
<dependencies>
+ <dependency>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
diff --git
a/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/metric/FlinkRestClient.java
b/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/metric/FlinkRestClient.java
index a5c52707e..d89d1d622 100644
---
a/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/metric/FlinkRestClient.java
+++
b/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/metric/FlinkRestClient.java
@@ -19,9 +19,9 @@
package org.apache.paimon.benchmark.metric;
import org.apache.paimon.benchmark.utils.BenchmarkUtils;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.JsonNode;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.node.ArrayNode;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ArrayNode;
import org.apache.http.Consts;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
diff --git
a/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/metric/cpu/CpuMetric.java
b/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/metric/cpu/CpuMetric.java
index 26a63d5e2..f02e0b6bd 100644
---
a/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/metric/cpu/CpuMetric.java
+++
b/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/metric/cpu/CpuMetric.java
@@ -19,14 +19,13 @@
package org.apache.paimon.benchmark.metric.cpu;
import org.apache.paimon.benchmark.utils.BenchmarkUtils;
-
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonInclude;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ArrayNode;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.annotation.JsonIgnore;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.annotation.JsonInclude;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonProcessingException;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.JsonNode;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.node.ArrayNode;
import javax.annotation.Nullable;
diff --git
a/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/utils/BenchmarkUtils.java
b/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/utils/BenchmarkUtils.java
index 241b781a6..413dbb2c6 100644
---
a/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/utils/BenchmarkUtils.java
+++
b/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/utils/BenchmarkUtils.java
@@ -18,8 +18,9 @@
package org.apache.paimon.benchmark.utils;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+
import org.slf4j.Logger;
import java.text.DecimalFormat;
diff --git a/paimon-bundle/pom.xml b/paimon-bundle/pom.xml
index ea0be2955..c2d2c54b8 100644
--- a/paimon-bundle/pom.xml
+++ b/paimon-bundle/pom.xml
@@ -92,21 +92,21 @@ under the License.
<!-- other runtime dependencies -->
<dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-jackson</artifactId>
-
<version>${flink.shaded.jackson.version}-${flink.shaded.version}</version>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-shade-jackson-2</artifactId>
+
<version>${paimon.shade.jackson.version}-${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-guava</artifactId>
-
<version>${flink.shaded.guava.version}-${flink.shaded.version}</version>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-shade-guava-30</artifactId>
+ <version>${paimon.shade.guava.version}-${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-asm-9</artifactId>
-
<version>${flink.shaded.asm.version}-${flink.shaded.version}</version>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-shade-caffeine-2</artifactId>
+
<version>${paimon.shade.caffeine.version}-${project.version}</version>
</dependency>
</dependencies>
@@ -125,10 +125,10 @@ under the License.
<configuration>
<artifactSet>
<includes combine.children="append">
- <!-- Flink -->
-
<include>org.apache.flink:flink-shaded-jackson</include>
-
<include>org.apache.flink:flink-shaded-guava</include>
-
<include>org.apache.flink:flink-shaded-asm-9</include>
+ <!-- Paimon-shade -->
+
<include>org.apache.paimon:paimon-shade-jackson-2</include>
+
<include>org.apache.paimon:paimon-shade-guava-30</include>
+
<include>org.apache.paimon:paimon-shade-caffeine-2</include>
<!-- Paimon -->
<include>org.apache.paimon:paimon-common</include>
diff --git a/paimon-common/pom.xml b/paimon-common/pom.xml
index 23a432ba2..f62eada1b 100644
--- a/paimon-common/pom.xml
+++ b/paimon-common/pom.xml
@@ -37,15 +37,21 @@ under the License.
<dependencies>
<dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-jackson</artifactId>
-
<version>${flink.shaded.jackson.version}-${flink.shaded.version}</version>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-shade-jackson-2</artifactId>
+
<version>${paimon.shade.jackson.version}-${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-shade-guava-30</artifactId>
+ <version>${paimon.shade.guava.version}-${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-guava</artifactId>
-
<version>${flink.shaded.guava.version}-${flink.shaded.version}</version>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-shade-caffeine-2</artifactId>
+
<version>${paimon.shade.caffeine.version}-${project.version}</version>
</dependency>
<!-- Java compiler -->
diff --git
a/paimon-common/src/main/java/org/apache/paimon/codegen/CompileUtils.java
b/paimon-common/src/main/java/org/apache/paimon/codegen/CompileUtils.java
index ec45221cd..8d66de5d4 100644
--- a/paimon-common/src/main/java/org/apache/paimon/codegen/CompileUtils.java
+++ b/paimon-common/src/main/java/org/apache/paimon/codegen/CompileUtils.java
@@ -18,8 +18,9 @@
package org.apache.paimon.codegen;
-import org.apache.flink.shaded.guava30.com.google.common.cache.Cache;
-import org.apache.flink.shaded.guava30.com.google.common.cache.CacheBuilder;
+import org.apache.paimon.shade.guava30.com.google.common.cache.Cache;
+import org.apache.paimon.shade.guava30.com.google.common.cache.CacheBuilder;
+
import org.codehaus.janino.SimpleCompiler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/paimon-common/src/main/java/org/apache/paimon/io/cache/CacheManager.java
b/paimon-common/src/main/java/org/apache/paimon/io/cache/CacheManager.java
index 2f0a1f4a8..e3c4edef0 100644
--- a/paimon-common/src/main/java/org/apache/paimon/io/cache/CacheManager.java
+++ b/paimon-common/src/main/java/org/apache/paimon/io/cache/CacheManager.java
@@ -21,10 +21,9 @@ package org.apache.paimon.io.cache;
import org.apache.paimon.annotation.VisibleForTesting;
import org.apache.paimon.memory.MemorySegment;
import org.apache.paimon.options.MemorySize;
-
-import org.apache.flink.shaded.guava30.com.google.common.cache.Cache;
-import org.apache.flink.shaded.guava30.com.google.common.cache.CacheBuilder;
-import
org.apache.flink.shaded.guava30.com.google.common.cache.RemovalNotification;
+import org.apache.paimon.shade.guava30.com.google.common.cache.Cache;
+import org.apache.paimon.shade.guava30.com.google.common.cache.CacheBuilder;
+import
org.apache.paimon.shade.guava30.com.google.common.cache.RemovalNotification;
import java.io.IOException;
import java.io.RandomAccessFile;
diff --git
a/paimon-common/src/main/java/org/apache/paimon/plugin/ComponentClassLoader.java
b/paimon-common/src/main/java/org/apache/paimon/plugin/ComponentClassLoader.java
index 4e24ae2a3..c075cb9e9 100644
---
a/paimon-common/src/main/java/org/apache/paimon/plugin/ComponentClassLoader.java
+++
b/paimon-common/src/main/java/org/apache/paimon/plugin/ComponentClassLoader.java
@@ -18,10 +18,9 @@
package org.apache.paimon.plugin;
import org.apache.paimon.annotation.VisibleForTesting;
+import org.apache.paimon.shade.guava30.com.google.common.collect.Iterators;
import org.apache.paimon.utils.FunctionWithException;
-import org.apache.flink.shaded.guava30.com.google.common.collect.Iterators;
-
import java.io.IOException;
import java.net.URL;
import java.net.URLClassLoader;
diff --git a/paimon-common/src/main/java/org/apache/paimon/types/ArrayType.java
b/paimon-common/src/main/java/org/apache/paimon/types/ArrayType.java
index 54e1311b0..c2c412d98 100644
--- a/paimon-common/src/main/java/org/apache/paimon/types/ArrayType.java
+++ b/paimon-common/src/main/java/org/apache/paimon/types/ArrayType.java
@@ -19,10 +19,9 @@
package org.apache.paimon.types;
import org.apache.paimon.annotation.Public;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;
import org.apache.paimon.utils.Preconditions;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-
import java.io.IOException;
import java.util.Objects;
import java.util.Set;
diff --git a/paimon-common/src/main/java/org/apache/paimon/types/DataField.java
b/paimon-common/src/main/java/org/apache/paimon/types/DataField.java
index 8b4e32865..964d91a0d 100644
--- a/paimon-common/src/main/java/org/apache/paimon/types/DataField.java
+++ b/paimon-common/src/main/java/org/apache/paimon/types/DataField.java
@@ -19,8 +19,7 @@
package org.apache.paimon.types;
import org.apache.paimon.annotation.Public;
-
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;
import javax.annotation.Nullable;
diff --git a/paimon-common/src/main/java/org/apache/paimon/types/DataType.java
b/paimon-common/src/main/java/org/apache/paimon/types/DataType.java
index 165d48245..324734a53 100644
--- a/paimon-common/src/main/java/org/apache/paimon/types/DataType.java
+++ b/paimon-common/src/main/java/org/apache/paimon/types/DataType.java
@@ -19,10 +19,9 @@
package org.apache.paimon.types;
import org.apache.paimon.annotation.Public;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;
import org.apache.paimon.utils.Preconditions;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-
import javax.annotation.Nonnull;
import java.io.IOException;
diff --git
a/paimon-common/src/main/java/org/apache/paimon/types/DataTypeJsonParser.java
b/paimon-common/src/main/java/org/apache/paimon/types/DataTypeJsonParser.java
index 56cf14df4..0af68df9d 100644
---
a/paimon-common/src/main/java/org/apache/paimon/types/DataTypeJsonParser.java
+++
b/paimon-common/src/main/java/org/apache/paimon/types/DataTypeJsonParser.java
@@ -18,7 +18,7 @@
package org.apache.paimon.types;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.JsonNode;
import javax.annotation.Nullable;
diff --git a/paimon-common/src/main/java/org/apache/paimon/types/MapType.java
b/paimon-common/src/main/java/org/apache/paimon/types/MapType.java
index 202ae8151..ca588b69a 100644
--- a/paimon-common/src/main/java/org/apache/paimon/types/MapType.java
+++ b/paimon-common/src/main/java/org/apache/paimon/types/MapType.java
@@ -19,10 +19,9 @@
package org.apache.paimon.types;
import org.apache.paimon.annotation.Public;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;
import org.apache.paimon.utils.Preconditions;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-
import java.io.IOException;
import java.util.Objects;
import java.util.Set;
diff --git
a/paimon-common/src/main/java/org/apache/paimon/types/MultisetType.java
b/paimon-common/src/main/java/org/apache/paimon/types/MultisetType.java
index 4caa601d9..abdc5756b 100644
--- a/paimon-common/src/main/java/org/apache/paimon/types/MultisetType.java
+++ b/paimon-common/src/main/java/org/apache/paimon/types/MultisetType.java
@@ -19,10 +19,9 @@
package org.apache.paimon.types;
import org.apache.paimon.annotation.Public;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;
import org.apache.paimon.utils.Preconditions;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-
import java.io.IOException;
import java.util.Objects;
import java.util.Set;
diff --git a/paimon-common/src/main/java/org/apache/paimon/types/RowType.java
b/paimon-common/src/main/java/org/apache/paimon/types/RowType.java
index beeb70f3b..df3199125 100644
--- a/paimon-common/src/main/java/org/apache/paimon/types/RowType.java
+++ b/paimon-common/src/main/java/org/apache/paimon/types/RowType.java
@@ -19,11 +19,10 @@
package org.apache.paimon.types;
import org.apache.paimon.annotation.Public;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;
import org.apache.paimon.utils.Preconditions;
import org.apache.paimon.utils.StringUtils;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/paimon-core/pom.xml b/paimon-core/pom.xml
index 554b4703c..35a6ca56d 100644
--- a/paimon-core/pom.xml
+++ b/paimon-core/pom.xml
@@ -44,14 +44,14 @@ under the License.
<version>${project.version}</version>
</dependency>
- <!-- flink dependencies -->
-
<dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-jackson</artifactId>
-
<version>${flink.shaded.jackson.version}-${flink.shaded.version}</version>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-shade-jackson-2</artifactId>
+
<version>${paimon.shade.jackson.version}-${project.version}</version>
</dependency>
+ <!-- flink dependencies -->
+
<dependency>
<groupId>org.lz4</groupId>
<artifactId>lz4-java</artifactId>
diff --git a/paimon-core/src/main/java/org/apache/paimon/Snapshot.java
b/paimon-core/src/main/java/org/apache/paimon/Snapshot.java
index 0758ee90d..be4e79ceb 100644
--- a/paimon-core/src/main/java/org/apache/paimon/Snapshot.java
+++ b/paimon-core/src/main/java/org/apache/paimon/Snapshot.java
@@ -24,12 +24,11 @@ import org.apache.paimon.manifest.ManifestEntry;
import org.apache.paimon.manifest.ManifestFileMeta;
import org.apache.paimon.manifest.ManifestList;
import org.apache.paimon.operation.FileStoreScan;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.annotation.JsonGetter;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.paimon.utils.JsonSerdeUtil;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonGetter;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
-
import javax.annotation.Nullable;
import java.io.IOException;
diff --git
a/paimon-core/src/main/java/org/apache/paimon/mergetree/LookupLevels.java
b/paimon-core/src/main/java/org/apache/paimon/mergetree/LookupLevels.java
index 3066881c0..e02d74f65 100644
--- a/paimon-core/src/main/java/org/apache/paimon/mergetree/LookupLevels.java
+++ b/paimon-core/src/main/java/org/apache/paimon/mergetree/LookupLevels.java
@@ -30,15 +30,14 @@ import org.apache.paimon.lookup.LookupStoreWriter;
import org.apache.paimon.memory.MemorySegment;
import org.apache.paimon.options.MemorySize;
import org.apache.paimon.reader.RecordReader;
+import org.apache.paimon.shade.guava30.com.google.common.cache.Cache;
+import org.apache.paimon.shade.guava30.com.google.common.cache.CacheBuilder;
+import
org.apache.paimon.shade.guava30.com.google.common.cache.RemovalNotification;
import org.apache.paimon.types.RowKind;
import org.apache.paimon.types.RowType;
import org.apache.paimon.utils.FileIOUtils;
import org.apache.paimon.utils.IOFunction;
-import org.apache.flink.shaded.guava30.com.google.common.cache.Cache;
-import org.apache.flink.shaded.guava30.com.google.common.cache.CacheBuilder;
-import
org.apache.flink.shaded.guava30.com.google.common.cache.RemovalNotification;
-
import javax.annotation.Nullable;
import java.io.Closeable;
diff --git
a/paimon-core/src/main/java/org/apache/paimon/operation/FileStoreExpireImpl.java
b/paimon-core/src/main/java/org/apache/paimon/operation/FileStoreExpireImpl.java
index 1a33a8ef7..d4e1e1754 100644
---
a/paimon-core/src/main/java/org/apache/paimon/operation/FileStoreExpireImpl.java
+++
b/paimon-core/src/main/java/org/apache/paimon/operation/FileStoreExpireImpl.java
@@ -26,10 +26,10 @@ import org.apache.paimon.manifest.ManifestEntry;
import org.apache.paimon.manifest.ManifestFile;
import org.apache.paimon.manifest.ManifestFileMeta;
import org.apache.paimon.manifest.ManifestList;
+import org.apache.paimon.shade.guava30.com.google.common.collect.Iterables;
import org.apache.paimon.utils.FileStorePathFactory;
import org.apache.paimon.utils.SnapshotManager;
-import org.apache.flink.shaded.guava30.com.google.common.collect.Iterables;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/paimon-core/src/main/java/org/apache/paimon/operation/MemoryFileStoreWrite.java
b/paimon-core/src/main/java/org/apache/paimon/operation/MemoryFileStoreWrite.java
index 80153ac29..621797aee 100644
---
a/paimon-core/src/main/java/org/apache/paimon/operation/MemoryFileStoreWrite.java
+++
b/paimon-core/src/main/java/org/apache/paimon/operation/MemoryFileStoreWrite.java
@@ -23,11 +23,10 @@ import org.apache.paimon.io.cache.CacheManager;
import org.apache.paimon.memory.HeapMemorySegmentPool;
import org.apache.paimon.memory.MemoryOwner;
import org.apache.paimon.memory.MemoryPoolFactory;
+import org.apache.paimon.shade.guava30.com.google.common.collect.Iterators;
import org.apache.paimon.utils.RecordWriter;
import org.apache.paimon.utils.SnapshotManager;
-import org.apache.flink.shaded.guava30.com.google.common.collect.Iterators;
-
import java.util.Iterator;
import java.util.Map;
diff --git
a/paimon-core/src/main/java/org/apache/paimon/predicate/BucketSelector.java
b/paimon-core/src/main/java/org/apache/paimon/predicate/BucketSelector.java
index 07d2bf643..295910f03 100644
--- a/paimon-core/src/main/java/org/apache/paimon/predicate/BucketSelector.java
+++ b/paimon-core/src/main/java/org/apache/paimon/predicate/BucketSelector.java
@@ -22,11 +22,10 @@ import org.apache.paimon.annotation.VisibleForTesting;
import org.apache.paimon.data.BinaryRow;
import org.apache.paimon.data.GenericRow;
import org.apache.paimon.data.serializer.InternalRowSerializer;
+import org.apache.paimon.shade.guava30.com.google.common.collect.ImmutableSet;
import org.apache.paimon.table.sink.BucketComputer;
import org.apache.paimon.types.RowType;
-import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableSet;
-
import javax.annotation.concurrent.ThreadSafe;
import java.io.Serializable;
diff --git
a/paimon-core/src/main/java/org/apache/paimon/schema/SchemaSerializer.java
b/paimon-core/src/main/java/org/apache/paimon/schema/SchemaSerializer.java
index e61727ff3..46cdd1284 100644
--- a/paimon-core/src/main/java/org/apache/paimon/schema/SchemaSerializer.java
+++ b/paimon-core/src/main/java/org/apache/paimon/schema/SchemaSerializer.java
@@ -18,15 +18,14 @@
package org.apache.paimon.schema;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.JsonNode;
import org.apache.paimon.types.DataField;
import org.apache.paimon.types.DataTypeJsonParser;
import org.apache.paimon.utils.JsonDeserializer;
import org.apache.paimon.utils.JsonSerializer;
import org.apache.paimon.utils.StringUtils;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
diff --git
a/paimon-core/src/main/java/org/apache/paimon/table/system/AuditLogTable.java
b/paimon-core/src/main/java/org/apache/paimon/table/system/AuditLogTable.java
index a12cd0862..760267558 100644
---
a/paimon-core/src/main/java/org/apache/paimon/table/system/AuditLogTable.java
+++
b/paimon-core/src/main/java/org/apache/paimon/table/system/AuditLogTable.java
@@ -29,6 +29,7 @@ import org.apache.paimon.predicate.Predicate;
import org.apache.paimon.predicate.PredicateBuilder;
import org.apache.paimon.predicate.PredicateReplaceVisitor;
import org.apache.paimon.reader.RecordReader;
+import org.apache.paimon.shade.guava30.com.google.common.primitives.Ints;
import org.apache.paimon.table.DataTable;
import org.apache.paimon.table.FileStoreTable;
import org.apache.paimon.table.ReadonlyTable;
@@ -47,8 +48,6 @@ import org.apache.paimon.utils.Filter;
import org.apache.paimon.utils.ProjectedRow;
import org.apache.paimon.utils.SnapshotManager;
-import org.apache.flink.shaded.guava30.com.google.common.primitives.Ints;
-
import javax.annotation.Nullable;
import java.io.IOException;
diff --git
a/paimon-core/src/main/java/org/apache/paimon/table/system/FilesTable.java
b/paimon-core/src/main/java/org/apache/paimon/table/system/FilesTable.java
index 5974925eb..9ea81091a 100644
--- a/paimon-core/src/main/java/org/apache/paimon/table/system/FilesTable.java
+++ b/paimon-core/src/main/java/org/apache/paimon/table/system/FilesTable.java
@@ -28,6 +28,7 @@ import org.apache.paimon.predicate.Predicate;
import org.apache.paimon.reader.RecordReader;
import org.apache.paimon.schema.SchemaManager;
import org.apache.paimon.schema.TableSchema;
+import org.apache.paimon.shade.guava30.com.google.common.collect.Iterators;
import org.apache.paimon.stats.BinaryTableStats;
import org.apache.paimon.stats.FieldStatsArraySerializer;
import org.apache.paimon.stats.FieldStatsConverters;
@@ -50,8 +51,6 @@ import org.apache.paimon.utils.ProjectedRow;
import org.apache.paimon.utils.RowDataToObjectArrayConverter;
import org.apache.paimon.utils.SerializationUtils;
-import org.apache.flink.shaded.guava30.com.google.common.collect.Iterators;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
diff --git
a/paimon-core/src/main/java/org/apache/paimon/table/system/OptionsTable.java
b/paimon-core/src/main/java/org/apache/paimon/table/system/OptionsTable.java
index 975fb8cfc..9645ccd12 100644
--- a/paimon-core/src/main/java/org/apache/paimon/table/system/OptionsTable.java
+++ b/paimon-core/src/main/java/org/apache/paimon/table/system/OptionsTable.java
@@ -26,6 +26,7 @@ import org.apache.paimon.fs.Path;
import org.apache.paimon.predicate.Predicate;
import org.apache.paimon.reader.RecordReader;
import org.apache.paimon.schema.SchemaManager;
+import org.apache.paimon.shade.guava30.com.google.common.collect.Iterators;
import org.apache.paimon.table.ReadonlyTable;
import org.apache.paimon.table.Table;
import org.apache.paimon.table.source.InnerTableRead;
@@ -37,8 +38,6 @@ import org.apache.paimon.types.RowType;
import org.apache.paimon.utils.IteratorRecordReader;
import org.apache.paimon.utils.ProjectedRow;
-import org.apache.flink.shaded.guava30.com.google.common.collect.Iterators;
-
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
diff --git
a/paimon-core/src/main/java/org/apache/paimon/table/system/SchemasTable.java
b/paimon-core/src/main/java/org/apache/paimon/table/system/SchemasTable.java
index c855f4f4e..a5b5f188b 100644
--- a/paimon-core/src/main/java/org/apache/paimon/table/system/SchemasTable.java
+++ b/paimon-core/src/main/java/org/apache/paimon/table/system/SchemasTable.java
@@ -27,6 +27,7 @@ import org.apache.paimon.predicate.Predicate;
import org.apache.paimon.reader.RecordReader;
import org.apache.paimon.schema.SchemaManager;
import org.apache.paimon.schema.TableSchema;
+import org.apache.paimon.shade.guava30.com.google.common.collect.Iterators;
import org.apache.paimon.table.ReadonlyTable;
import org.apache.paimon.table.Table;
import org.apache.paimon.table.source.InnerTableRead;
@@ -42,8 +43,6 @@ import org.apache.paimon.utils.JsonSerdeUtil;
import org.apache.paimon.utils.ProjectedRow;
import org.apache.paimon.utils.SerializationUtils;
-import org.apache.flink.shaded.guava30.com.google.common.collect.Iterators;
-
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
diff --git
a/paimon-core/src/main/java/org/apache/paimon/table/system/SnapshotsTable.java
b/paimon-core/src/main/java/org/apache/paimon/table/system/SnapshotsTable.java
index 216ca052d..f2418a447 100644
---
a/paimon-core/src/main/java/org/apache/paimon/table/system/SnapshotsTable.java
+++
b/paimon-core/src/main/java/org/apache/paimon/table/system/SnapshotsTable.java
@@ -27,6 +27,7 @@ import org.apache.paimon.fs.FileIO;
import org.apache.paimon.fs.Path;
import org.apache.paimon.predicate.Predicate;
import org.apache.paimon.reader.RecordReader;
+import org.apache.paimon.shade.guava30.com.google.common.collect.Iterators;
import org.apache.paimon.table.ReadonlyTable;
import org.apache.paimon.table.Table;
import org.apache.paimon.table.source.InnerTableRead;
@@ -42,8 +43,6 @@ import org.apache.paimon.utils.ProjectedRow;
import org.apache.paimon.utils.SerializationUtils;
import org.apache.paimon.utils.SnapshotManager;
-import org.apache.flink.shaded.guava30.com.google.common.collect.Iterators;
-
import java.io.IOException;
import java.time.Instant;
import java.time.LocalDateTime;
diff --git
a/paimon-core/src/main/java/org/apache/paimon/utils/JsonDeserializer.java
b/paimon-core/src/main/java/org/apache/paimon/utils/JsonDeserializer.java
index 365be6467..57d682cec 100644
--- a/paimon-core/src/main/java/org/apache/paimon/utils/JsonDeserializer.java
+++ b/paimon-core/src/main/java/org/apache/paimon/utils/JsonDeserializer.java
@@ -18,7 +18,7 @@
package org.apache.paimon.utils;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.JsonNode;
/** Json deserializer for jackson. */
public interface JsonDeserializer<T> {
diff --git
a/paimon-core/src/main/java/org/apache/paimon/utils/JsonSerdeUtil.java
b/paimon-core/src/main/java/org/apache/paimon/utils/JsonSerdeUtil.java
index 4271455ea..3318bfefc 100644
--- a/paimon-core/src/main/java/org/apache/paimon/utils/JsonSerdeUtil.java
+++ b/paimon-core/src/main/java/org/apache/paimon/utils/JsonSerdeUtil.java
@@ -20,21 +20,20 @@ package org.apache.paimon.utils;
import org.apache.paimon.schema.SchemaSerializer;
import org.apache.paimon.schema.TableSchema;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonParser;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonProcessingException;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.DeserializationContext;
+import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.Module;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.SerializerProvider;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.module.SimpleModule;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.ser.std.StdSerializer;
import org.apache.paimon.types.DataField;
import org.apache.paimon.types.DataType;
import org.apache.paimon.types.DataTypeJsonParser;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonParser;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.DeserializationContext;
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.Module;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.SerializerProvider;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.module.SimpleModule;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ser.std.StdSerializer;
-
import java.io.IOException;
import java.io.UncheckedIOException;
diff --git
a/paimon-core/src/main/java/org/apache/paimon/utils/JsonSerializer.java
b/paimon-core/src/main/java/org/apache/paimon/utils/JsonSerializer.java
index f7112c693..b0bc6fcb4 100644
--- a/paimon-core/src/main/java/org/apache/paimon/utils/JsonSerializer.java
+++ b/paimon-core/src/main/java/org/apache/paimon/utils/JsonSerializer.java
@@ -18,7 +18,7 @@
package org.apache.paimon.utils;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;
import java.io.IOException;
diff --git
a/paimon-flink/paimon-flink-1.14/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
b/paimon-flink/paimon-flink-1.14/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
index 7b9e2fb72..ce5813821 100644
---
a/paimon-flink/paimon-flink-1.14/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
+++
b/paimon-flink/paimon-flink-1.14/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
@@ -21,9 +21,9 @@ package org.apache.paimon.flink;
import org.apache.paimon.Snapshot;
import org.apache.paimon.fs.Path;
import org.apache.paimon.fs.local.LocalFileIO;
+import org.apache.paimon.shade.guava30.com.google.common.collect.ImmutableList;
import org.apache.paimon.utils.SnapshotManager;
-import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableList;
import org.apache.flink.table.api.EnvironmentSettings;
import org.apache.flink.table.api.TableEnvironment;
import org.apache.flink.table.api.config.ExecutionConfigOptions;
diff --git
a/paimon-flink/paimon-flink-1.14/src/test/java/org/apache/paimon/flink/ContinuousFileStoreITCase.java
b/paimon-flink/paimon-flink-1.14/src/test/java/org/apache/paimon/flink/ContinuousFileStoreITCase.java
index 21738eed1..40f520683 100644
---
a/paimon-flink/paimon-flink-1.14/src/test/java/org/apache/paimon/flink/ContinuousFileStoreITCase.java
+++
b/paimon-flink/paimon-flink-1.14/src/test/java/org/apache/paimon/flink/ContinuousFileStoreITCase.java
@@ -20,10 +20,10 @@ package org.apache.paimon.flink;
import org.apache.paimon.Snapshot;
import org.apache.paimon.fs.local.LocalFileIO;
+import org.apache.paimon.shade.guava30.com.google.common.collect.ImmutableList;
import org.apache.paimon.utils.BlockingIterator;
import org.apache.paimon.utils.SnapshotManager;
-import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableList;
import org.apache.flink.types.Row;
import org.junit.Test;
diff --git
a/paimon-flink/paimon-flink-1.15/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
b/paimon-flink/paimon-flink-1.15/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
index 7b9e2fb72..ce5813821 100644
---
a/paimon-flink/paimon-flink-1.15/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
+++
b/paimon-flink/paimon-flink-1.15/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
@@ -21,9 +21,9 @@ package org.apache.paimon.flink;
import org.apache.paimon.Snapshot;
import org.apache.paimon.fs.Path;
import org.apache.paimon.fs.local.LocalFileIO;
+import org.apache.paimon.shade.guava30.com.google.common.collect.ImmutableList;
import org.apache.paimon.utils.SnapshotManager;
-import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableList;
import org.apache.flink.table.api.EnvironmentSettings;
import org.apache.flink.table.api.TableEnvironment;
import org.apache.flink.table.api.config.ExecutionConfigOptions;
diff --git
a/paimon-flink/paimon-flink-1.15/src/test/java/org/apache/paimon/flink/ContinuousFileStoreITCase.java
b/paimon-flink/paimon-flink-1.15/src/test/java/org/apache/paimon/flink/ContinuousFileStoreITCase.java
index 21738eed1..40f520683 100644
---
a/paimon-flink/paimon-flink-1.15/src/test/java/org/apache/paimon/flink/ContinuousFileStoreITCase.java
+++
b/paimon-flink/paimon-flink-1.15/src/test/java/org/apache/paimon/flink/ContinuousFileStoreITCase.java
@@ -20,10 +20,10 @@ package org.apache.paimon.flink;
import org.apache.paimon.Snapshot;
import org.apache.paimon.fs.local.LocalFileIO;
+import org.apache.paimon.shade.guava30.com.google.common.collect.ImmutableList;
import org.apache.paimon.utils.BlockingIterator;
import org.apache.paimon.utils.SnapshotManager;
-import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableList;
import org.apache.flink.types.Row;
import org.junit.Test;
diff --git a/paimon-flink/paimon-flink-common/pom.xml
b/paimon-flink/paimon-flink-common/pom.xml
index 69c5ba799..aabbb2e3d 100644
--- a/paimon-flink/paimon-flink-common/pom.xml
+++ b/paimon-flink/paimon-flink-common/pom.xml
@@ -273,14 +273,7 @@ under the License.
<configuration>
<artifactSet>
<includes combine.children="append">
- <!--
- TODO change these to paimon-bundle once we
get rid of flink-shaded dependencies
- -->
-
<include>org.apache.paimon:paimon-common</include>
-
<include>org.apache.paimon:paimon-core</include>
-
<include>org.apache.paimon:paimon-format</include>
-
<include>org.apache.paimon:paimon-codegen-loader</include>
-
<include>org.apache.paimon:paimon-hive-catalog</include>
+
<include>org.apache.paimon:paimon-bundle</include>
</includes>
</artifactSet>
<relocations>
diff --git
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/action/cdc/mysql/MySqlDebeziumJsonEventParser.java
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/action/cdc/mysql/MySqlDebeziumJsonEventParser.java
index daf28fe75..0704e5f87 100644
---
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/action/cdc/mysql/MySqlDebeziumJsonEventParser.java
+++
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/action/cdc/mysql/MySqlDebeziumJsonEventParser.java
@@ -21,12 +21,12 @@ package org.apache.paimon.flink.action.cdc.mysql;
import org.apache.paimon.flink.sink.cdc.CdcRecord;
import org.apache.paimon.flink.sink.cdc.EventParser;
import org.apache.paimon.schema.SchemaChange;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.type.TypeReference;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.JsonNode;
+import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.paimon.types.RowKind;
import org.apache.paimon.utils.Preconditions;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.type.TypeReference;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.kafka.connect.json.JsonConverterConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/lookup/FileStoreLookupFunction.java
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/lookup/FileStoreLookupFunction.java
index 306869692..6332e7051 100644
---
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/lookup/FileStoreLookupFunction.java
+++
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/lookup/FileStoreLookupFunction.java
@@ -26,12 +26,12 @@ import org.apache.paimon.flink.utils.TableScanUtils;
import org.apache.paimon.options.Options;
import org.apache.paimon.predicate.Predicate;
import org.apache.paimon.predicate.PredicateFilter;
+import org.apache.paimon.shade.guava30.com.google.common.primitives.Ints;
import org.apache.paimon.table.Table;
import org.apache.paimon.types.RowType;
import org.apache.paimon.utils.FileIOUtils;
import org.apache.paimon.utils.TypeUtils;
-import org.apache.flink.shaded.guava30.com.google.common.primitives.Ints;
import org.apache.flink.streaming.api.operators.StreamingRuntimeContext;
import org.apache.flink.table.data.RowData;
import org.apache.flink.table.functions.FunctionContext;
diff --git
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/lookup/RocksDBState.java
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/lookup/RocksDBState.java
index da93ce17d..aee02448d 100644
---
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/lookup/RocksDBState.java
+++
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/lookup/RocksDBState.java
@@ -22,9 +22,9 @@ import org.apache.paimon.data.InternalRow;
import org.apache.paimon.data.serializer.Serializer;
import org.apache.paimon.io.DataInputDeserializer;
import org.apache.paimon.io.DataOutputSerializer;
+import org.apache.paimon.shade.guava30.com.google.common.cache.Cache;
+import org.apache.paimon.shade.guava30.com.google.common.cache.CacheBuilder;
-import org.apache.flink.shaded.guava30.com.google.common.cache.Cache;
-import org.apache.flink.shaded.guava30.com.google.common.cache.CacheBuilder;
import org.rocksdb.ColumnFamilyHandle;
import org.rocksdb.RocksDB;
import org.rocksdb.WriteOptions;
diff --git
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/lookup/TableStreamingReader.java
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/lookup/TableStreamingReader.java
index 75e5fadb1..8dab81b51 100644
---
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/lookup/TableStreamingReader.java
+++
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/lookup/TableStreamingReader.java
@@ -24,6 +24,8 @@ import org.apache.paimon.mergetree.compact.ConcatRecordReader;
import org.apache.paimon.predicate.Predicate;
import org.apache.paimon.predicate.PredicateFilter;
import org.apache.paimon.reader.RecordReaderIterator;
+import org.apache.paimon.shade.guava30.com.google.common.collect.Iterators;
+import org.apache.paimon.shade.guava30.com.google.common.primitives.Ints;
import org.apache.paimon.table.Table;
import org.apache.paimon.table.source.EndOfScanException;
import org.apache.paimon.table.source.ReadBuilder;
@@ -33,9 +35,6 @@ import org.apache.paimon.table.source.TableRead;
import org.apache.paimon.table.source.TableScan;
import org.apache.paimon.utils.TypeUtils;
-import org.apache.flink.shaded.guava30.com.google.common.collect.Iterators;
-import org.apache.flink.shaded.guava30.com.google.common.primitives.Ints;
-
import javax.annotation.Nullable;
import java.io.IOException;
diff --git
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
index 4d74ac561..cee0aafa9 100644
---
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
+++
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
@@ -22,10 +22,10 @@ import org.apache.paimon.Snapshot;
import org.apache.paimon.flink.util.AbstractTestBase;
import org.apache.paimon.fs.Path;
import org.apache.paimon.fs.local.LocalFileIO;
+import org.apache.paimon.shade.guava30.com.google.common.collect.ImmutableList;
import org.apache.paimon.utils.BlockingIterator;
import org.apache.paimon.utils.SnapshotManager;
-import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableList;
import org.apache.flink.table.api.EnvironmentSettings;
import org.apache.flink.table.api.TableEnvironment;
import org.apache.flink.table.api.config.ExecutionConfigOptions;
diff --git
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/ContinuousFileStoreITCase.java
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/ContinuousFileStoreITCase.java
index 851a3603a..a9eee15b2 100644
---
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/ContinuousFileStoreITCase.java
+++
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/ContinuousFileStoreITCase.java
@@ -20,10 +20,10 @@ package org.apache.paimon.flink;
import org.apache.paimon.Snapshot;
import org.apache.paimon.fs.local.LocalFileIO;
+import org.apache.paimon.shade.guava30.com.google.common.collect.ImmutableList;
import org.apache.paimon.utils.BlockingIterator;
import org.apache.paimon.utils.SnapshotManager;
-import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableList;
import org.apache.flink.table.api.ValidationException;
import
org.apache.flink.testutils.junit.extensions.parameterized.ParameterizedTestExtension;
import org.apache.flink.testutils.junit.extensions.parameterized.Parameters;
diff --git
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/MappingTableITCase.java
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/MappingTableITCase.java
index ac3b0811d..d90477bdd 100644
---
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/MappingTableITCase.java
+++
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/MappingTableITCase.java
@@ -19,8 +19,8 @@
package org.apache.paimon.flink;
import org.apache.paimon.flink.util.AbstractTestBase;
+import org.apache.paimon.shade.guava30.com.google.common.collect.ImmutableList;
-import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableList;
import org.apache.flink.table.api.EnvironmentSettings;
import org.apache.flink.table.api.TableEnvironment;
import org.apache.flink.table.api.ValidationException;
diff --git a/paimon-flink/pom.xml b/paimon-flink/pom.xml
index d2cba2403..0d9e0ccd0 100644
--- a/paimon-flink/pom.xml
+++ b/paimon-flink/pom.xml
@@ -42,37 +42,9 @@ under the License.
</modules>
<dependencies>
- <!--
- TODO change these to paimon-bundle once we get rid of flink-shaded
dependencies
- -->
-
- <dependency>
- <groupId>org.apache.paimon</groupId>
- <artifactId>paimon-codegen-loader</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.paimon</groupId>
- <artifactId>paimon-common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.paimon</groupId>
- <artifactId>paimon-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.paimon</groupId>
- <artifactId>paimon-format</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.paimon</groupId>
- <artifactId>paimon-hive-catalog</artifactId>
+ <artifactId>paimon-bundle</artifactId>
<version>${project.version}</version>
</dependency>
diff --git
a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/runner/PaimonEmbeddedHiveRunner.java
b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/runner/PaimonEmbeddedHiveRunner.java
index 3289c6a26..eaebcf70c 100644
---
a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/runner/PaimonEmbeddedHiveRunner.java
+++
b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/runner/PaimonEmbeddedHiveRunner.java
@@ -18,6 +18,7 @@
package org.apache.paimon.hive.runner;
+import org.apache.paimon.shade.guava30.com.google.common.io.Resources;
import org.apache.paimon.utils.Preconditions;
import com.klarna.hiverunner.HiveServerContainer;
@@ -32,7 +33,6 @@ import com.klarna.hiverunner.annotations.HiveSetupScript;
import com.klarna.hiverunner.builder.HiveShellBuilder;
import com.klarna.hiverunner.config.HiveRunnerConfig;
import com.klarna.reflection.ReflectionUtils;
-import org.apache.flink.shaded.guava30.com.google.common.io.Resources;
import org.junit.Ignore;
import org.junit.internal.AssumptionViolatedException;
import org.junit.internal.runners.model.EachTestNotifier;
diff --git a/pom.xml b/pom.xml
index c8c8ffa1a..39e4e0544 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,10 +69,9 @@ under the License.
</modules>
<properties>
- <flink.shaded.version>15.0</flink.shaded.version>
- <flink.shaded.jackson.version>2.12.4</flink.shaded.jackson.version>
- <flink.shaded.guava.version>30.1.1-jre</flink.shaded.guava.version>
- <flink.shaded.asm.version>9.2</flink.shaded.asm.version>
+ <paimon.shade.jackson.version>2.14.2</paimon.shade.jackson.version>
+ <paimon.shade.guava.version>30.1.1-jre</paimon.shade.guava.version>
+ <paimon.shade.caffeine.version>2.9.3</paimon.shade.caffeine.version>
<hadoop.version>2.8.5</hadoop.version>
<scala.version>2.12.7</scala.version>
<scala.binary.version>2.12</scala.binary.version>
diff --git a/tools/maven/checkstyle.xml b/tools/maven/checkstyle.xml
index b430e497b..5e1d44086 100644
--- a/tools/maven/checkstyle.xml
+++ b/tools/maven/checkstyle.xml
@@ -214,19 +214,11 @@ This file is based on the checkstyle file of Apache Beam.
</module>
<module name="IllegalImport">
<property name="illegalPkgs"
value="org.codehaus.jackson"/>
- <message key="import.illegal" value="{0}; Use
flink-shaded-jackson instead."/>
- </module>
- <module name="IllegalImport">
- <property name="illegalPkgs" value="org.objectweb.asm"/>
- <message key="import.illegal" value="{0}; Use
flink-shaded-asm instead."/>
- </module>
- <module name="IllegalImport">
- <property name="illegalPkgs" value="io.netty"/>
- <message key="import.illegal" value="{0}; Use
flink-shaded-netty instead."/>
+ <message key="import.illegal" value="{0}; Use
paimon-shade-jackson instead."/>
</module>
<module name="IllegalImport">
<property name="illegalPkgs" value="com.google.common"/>
- <message key="import.illegal" value="{0}; Use
flink-shaded-guava instead."/>
+ <message key="import.illegal" value="{0}; Use
paimon-shade-guava instead."/>
</module>
<module name="RedundantModifier">
