You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fluss.apache.org by ja...@apache.org on 2025/08/24 16:26:13 UTC
(fluss) branch main updated: [common] Upgrade fluss-shaded to org.apache.fluss:1.0-incubating (#1494)
This is an automated email from the ASF dual-hosted git repository.
jark pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/fluss.git
The following commit(s) were added to refs/heads/main by this push:
new f9e875df5 [common] Upgrade fluss-shaded to org.apache.fluss:1.0-incubating (#1494)
f9e875df5 is described below
commit f9e875df5389d0b3d18bccc1d6f73fa5ac7440be
Author: CaoZhen <ca...@outlook.com>
AuthorDate: Mon Aug 25 00:26:09 2025 +0800
[common] Upgrade fluss-shaded to org.apache.fluss:1.0-incubating (#1494)
---
.../fluss/client/write/RecordAccumulator.java | 4 +-
fluss-client/src/main/resources/META-INF/NOTICE | 4 +
.../security/acl/FlussAuthorizationITCase.java | 2 +-
.../fluss/client/write/ArrowLogWriteBatchTest.java | 4 +-
fluss-common/pom.xml | 8 +-
.../fluss/bucketing/IcebergBucketingFunction.java | 4 +-
.../fluss/classloading/ComponentClassLoader.java | 3 +-
.../fluss/compression/ArrowCompressionFactory.java | 7 +-
.../fluss/compression/ArrowCompressionInfo.java | 3 +-
.../compression/Lz4ArrowCompressionCodec.java | 9 ++-
.../compression/ZstdArrowCompressionCodec.java | 9 +--
.../main/java/com/alibaba/fluss/fs/FileSystem.java | 6 +-
.../fluss/fs/token/CredentialsJsonSerde.java | 5 +-
.../lake/lakestorage/LakeStoragePluginSetUp.java | 3 +-
.../fluss/metrics/reporter/ReporterSetup.java | 2 +-
.../alibaba/fluss/plugin/DefaultPluginManager.java | 4 +-
.../alibaba/fluss/record/BytesViewLogRecords.java | 5 +-
.../fluss/record/DefaultLogRecordBatch.java | 5 +-
.../alibaba/fluss/record/FileLogProjection.java | 31 ++++----
.../com/alibaba/fluss/record/LogRecordBatch.java | 5 +-
.../alibaba/fluss/record/LogRecordReadContext.java | 7 +-
.../fluss/record/bytesview/ByteBufBytesView.java | 4 +-
.../alibaba/fluss/record/bytesview/BytesView.java | 3 +-
.../record/bytesview/FileRegionBytesView.java | 7 +-
.../fluss/record/bytesview/FlussFileRegion.java | 12 +--
.../record/bytesview/MemorySegmentBytesView.java | 5 +-
.../fluss/record/bytesview/MultiBytesView.java | 5 +-
.../com/alibaba/fluss/record/send/ByteBufSend.java | 4 +-
.../fluss/record/send/ByteBufWritableOutput.java | 3 +-
.../alibaba/fluss/record/send/FileRegionSend.java | 4 +-
.../com/alibaba/fluss/record/send/MultiSend.java | 2 +-
.../java/com/alibaba/fluss/record/send/Send.java | 2 +-
.../fluss/record/send/SendWritableOutput.java | 3 +-
.../alibaba/fluss/record/send/WritableOutput.java | 3 +-
.../com/alibaba/fluss/row/arrow/ArrowReader.java | 3 +-
.../com/alibaba/fluss/row/arrow/ArrowWriter.java | 25 +++---
.../alibaba/fluss/row/arrow/ArrowWriterPool.java | 5 +-
.../row/arrow/vectors/ArrowBigIntColumnVector.java | 3 +-
.../row/arrow/vectors/ArrowBinaryColumnVector.java | 3 +-
.../arrow/vectors/ArrowBooleanColumnVector.java | 3 +-
.../row/arrow/vectors/ArrowDateColumnVector.java | 3 +-
.../arrow/vectors/ArrowDecimalColumnVector.java | 3 +-
.../row/arrow/vectors/ArrowDoubleColumnVector.java | 3 +-
.../row/arrow/vectors/ArrowFloatColumnVector.java | 3 +-
.../row/arrow/vectors/ArrowIntColumnVector.java | 3 +-
.../arrow/vectors/ArrowSmallIntColumnVector.java | 3 +-
.../row/arrow/vectors/ArrowTimeColumnVector.java | 11 +--
.../vectors/ArrowTimestampLtzColumnVector.java | 15 ++--
.../vectors/ArrowTimestampNtzColumnVector.java | 15 ++--
.../arrow/vectors/ArrowTinyIntColumnVector.java | 3 +-
.../arrow/vectors/ArrowVarBinaryColumnVector.java | 3 +-
.../arrow/vectors/ArrowVarCharColumnVector.java | 3 +-
.../fluss/row/arrow/writers/ArrowBigIntWriter.java | 3 +-
.../fluss/row/arrow/writers/ArrowBinaryWriter.java | 3 +-
.../row/arrow/writers/ArrowBooleanWriter.java | 3 +-
.../fluss/row/arrow/writers/ArrowDateWriter.java | 3 +-
.../row/arrow/writers/ArrowDecimalWriter.java | 3 +-
.../fluss/row/arrow/writers/ArrowDoubleWriter.java | 3 +-
.../fluss/row/arrow/writers/ArrowFieldWriter.java | 3 +-
.../fluss/row/arrow/writers/ArrowFloatWriter.java | 3 +-
.../fluss/row/arrow/writers/ArrowIntWriter.java | 3 +-
.../row/arrow/writers/ArrowSmallIntWriter.java | 3 +-
.../fluss/row/arrow/writers/ArrowTimeWriter.java | 13 +--
.../row/arrow/writers/ArrowTimestampLtzWriter.java | 13 +--
.../row/arrow/writers/ArrowTimestampNtzWriter.java | 13 +--
.../row/arrow/writers/ArrowTinyIntWriter.java | 3 +-
.../row/arrow/writers/ArrowVarBinaryWriter.java | 3 +-
.../row/arrow/writers/ArrowVarCharWriter.java | 3 +-
.../com/alibaba/fluss/rpc/messages/ApiMessage.java | 3 +-
.../java/com/alibaba/fluss/utils/ArrowUtils.java | 93 +++++++++++-----------
.../com/alibaba/fluss/utils/CloseableRegistry.java | 2 +-
.../java/com/alibaba/fluss/utils/NetUtils.java | 3 +-
.../com/alibaba/fluss/utils/ProtoCodecUtils.java | 4 +-
.../fluss/utils/json/BucketOffsetJsonSerde.java | 5 +-
.../alibaba/fluss/utils/json/ColumnJsonSerde.java | 5 +-
.../fluss/utils/json/DataTypeJsonSerde.java | 7 +-
.../utils/json/DatabaseDescriptorJsonSerde.java | 5 +-
.../alibaba/fluss/utils/json/JsonDeserializer.java | 2 +-
.../alibaba/fluss/utils/json/JsonSerdeUtils.java | 11 +--
.../alibaba/fluss/utils/json/JsonSerializer.java | 2 +-
.../alibaba/fluss/utils/json/SchemaJsonSerde.java | 5 +-
.../fluss/utils/json/TableDescriptorJsonSerde.java | 5 +-
.../fluss/utils/json/TablePartitionJsonSerde.java | 5 +-
.../compression/ArrowCompressionCodecTest.java | 35 ++++----
.../fluss/plugin/DefaultPluginManagerTest.java | 2 +-
.../alibaba/fluss/record/FileLogRecordsTest.java | 2 +-
.../record/MemoryLogRecordsArrowBuilderTest.java | 4 +-
.../fluss/record/send/SendWritableOutputTest.java | 4 +-
.../fluss/row/arrow/ArrowReaderWriterTest.java | 6 +-
.../fluss/row/arrow/ArrowWriterPoolTest.java | 5 +-
.../alibaba/fluss/testutils/ByteBufChannel.java | 17 ++--
.../com/alibaba/fluss/testutils/DataTestUtils.java | 5 +-
.../com/alibaba/fluss/utils/ArrowUtilsTest.java | 48 +++++------
.../alibaba/fluss/utils/ProtoCodecUtilsTest.java | 5 +-
.../fluss/utils/json/JsonSerdeTestBase.java | 3 +-
fluss-dist/src/main/resources/bin/fluss-daemon.sh | 2 +-
.../com/alibaba/fluss/fs/gs/AuthServerHandler.java | 37 ++++-----
.../com/alibaba/fluss/fs/gs/MockAuthServer.java | 26 +++---
.../JsonStringDeserializationSchema.java | 8 +-
.../tiering/committer/TieringCommitOperator.java | 4 +-
.../fluss/flink/tiering/source/TieringSource.java | 6 +-
.../flink/utils/FlussRowToJsonConverters.java | 9 ++-
.../fluss/jmh/ArrowReadableChannelBenchmark.java | 34 ++++----
.../fluss/jmh/ArrowWritableChannelBenchmark.java | 28 +++----
fluss-kafka/pom.xml | 2 +-
.../fluss/kafka/KafkaChannelInitializer.java | 9 ++-
.../alibaba/fluss/kafka/KafkaCommandDecoder.java | 12 +--
.../alibaba/fluss/kafka/KafkaProtocolPlugin.java | 3 +-
.../java/com/alibaba/fluss/kafka/KafkaRequest.java | 6 +-
.../fluss/kafka/KafkaRequestHandlerTest.java | 6 +-
.../fluss/kafka/TestingChannelHandlerContext.java | 22 ++---
.../lake/iceberg/tiering/IcebergLakeCommitter.java | 4 +-
.../lake/paimon/tiering/PaimonLakeCommitter.java | 4 +-
.../metrics/prometheus/PrometheusReporterTest.java | 2 +-
fluss-protogen/fluss-protogen-generator/pom.xml | 2 +-
.../generator/generator/ProtoCodeGenerator.java | 5 +-
.../protogen/generator/generator/ProtoGenUtil.java | 9 ++-
.../generator/generator/ProtobufNumberField.java | 3 +-
.../fluss/protogen/benchmark/ProtoBenchmark.java | 6 +-
.../fluss/protogen/benchmark/SimpleBenchmark.java | 6 +-
.../benchmark/StringEncodingBenchmark.java | 7 +-
.../fluss/protogen/tests/AddressBookTest.java | 5 +-
.../alibaba/fluss/protogen/tests/BytesTest.java | 4 +-
.../alibaba/fluss/protogen/tests/EnumsTest.java | 5 +-
.../alibaba/fluss/protogen/tests/MessagesTest.java | 4 +-
.../alibaba/fluss/protogen/tests/NumbersTest.java | 5 +-
.../fluss/protogen/tests/RepeatedNumbersTest.java | 5 +-
.../alibaba/fluss/protogen/tests/RequiredTest.java | 5 +-
.../alibaba/fluss/protogen/tests/StringsTest.java | 5 +-
.../java/com/alibaba/fluss/rpc/RpcGateway.java | 3 +-
.../fluss/rpc/netty/NettyChannelInitializer.java | 8 +-
.../com/alibaba/fluss/rpc/netty/NettyLogger.java | 11 ++-
.../com/alibaba/fluss/rpc/netty/NettyMetrics.java | 7 +-
.../com/alibaba/fluss/rpc/netty/NettyUtils.java | 26 +++---
.../rpc/netty/client/ClientChannelInitializer.java | 5 +-
.../fluss/rpc/netty/client/NettyClient.java | 8 +-
.../fluss/rpc/netty/client/NettyClientHandler.java | 12 +--
.../fluss/rpc/netty/client/ServerConnection.java | 12 +--
.../rpc/netty/server/FlussProtocolPlugin.java | 3 +-
.../fluss/rpc/netty/server/FlussRequest.java | 4 +-
.../fluss/rpc/netty/server/NettyServer.java | 14 ++--
.../fluss/rpc/netty/server/NettyServerHandler.java | 14 ++--
.../rpc/netty/server/ServerChannelInitializer.java | 6 +-
.../com/alibaba/fluss/rpc/protocol/ApiManager.java | 2 +-
.../com/alibaba/fluss/rpc/protocol/ApiMethod.java | 3 +-
.../alibaba/fluss/rpc/protocol/MessageCodec.java | 5 +-
.../fluss/rpc/protocol/NetworkProtocolPlugin.java | 3 +-
.../fluss/rpc/util/CommonRpcMessageUtils.java | 3 +-
.../fluss/rpc/netty/client/NettyClientTest.java | 2 +-
.../rpc/netty/server/NettyServerHandlerTest.java | 12 +--
.../fluss/rpc/protocol/MessageCodecTest.java | 12 +--
.../fluss/rpc/protocol/RequestChannelTest.java | 4 +-
fluss-server/pom.xml | 2 +-
.../fluss/server/authorizer/DefaultAuthorizer.java | 4 +-
.../ZkNodeChangeNotificationWatcher.java | 14 ++--
.../server/coordinator/CoordinatorServer.java | 2 +-
.../fluss/server/coordinator/MetadataManager.java | 2 +-
.../event/watcher/TableChangeWatcher.java | 6 +-
.../event/watcher/TabletServerChangeWatcher.java | 8 +-
.../statemachine/TableBucketStateMachine.java | 2 +-
.../com/alibaba/fluss/server/kv/KvManager.java | 4 +-
.../java/com/alibaba/fluss/server/kv/KvTablet.java | 2 +-
.../kv/snapshot/CompletedSnapshotJsonSerde.java | 5 +-
.../com/alibaba/fluss/server/log/LogSegment.java | 2 +-
.../fluss/server/log/WriterStateManager.java | 4 +-
.../log/remote/RemoteLogManifestJsonSerde.java | 5 +-
.../replica/fetcher/ReplicaFetcherThread.java | 2 +-
.../alibaba/fluss/server/tablet/TabletServer.java | 2 +-
...CuratorFrameworkWithUnhandledErrorListener.java | 4 +-
.../fluss/server/zk/ZkSequenceIDCounter.java | 9 ++-
.../alibaba/fluss/server/zk/ZooKeeperClient.java | 10 +--
.../alibaba/fluss/server/zk/ZooKeeperUtils.java | 18 ++---
.../server/zk/data/BucketSnapshotJsonSerde.java | 5 +-
.../zk/data/CoordinatorAddressJsonSerde.java | 5 +-
.../zk/data/DatabaseRegistrationJsonSerde.java | 5 +-
.../server/zk/data/LakeTableSnapshotJsonSerde.java | 5 +-
.../server/zk/data/LeaderAndIsrJsonSerde.java | 5 +-
.../zk/data/PartitionAssignmentJsonSerde.java | 5 +-
.../zk/data/RemoteLogManifestHandleJsonSerde.java | 5 +-
.../fluss/server/zk/data/ResourceAclJsonSerde.java | 5 +-
.../server/zk/data/TableAssignmentJsonSerde.java | 5 +-
.../server/zk/data/TableRegistrationJsonSerde.java | 5 +-
.../zk/data/TabletServerRegistrationJsonSerde.java | 5 +-
fluss-server/src/main/resources/META-INF/NOTICE | 5 ++
.../com/alibaba/fluss/server/ServerTestBase.java | 2 +-
.../statemachine/TableBucketStateMachineTest.java | 2 +-
.../com/alibaba/fluss/server/kv/KvTabletTest.java | 2 +-
.../kv/snapshot/PeriodicSnapshotManagerTest.java | 2 +-
.../fluss/server/kv/wal/ArrowWalBuilderTest.java | 4 +-
.../log/remote/DefaultRemoteLogStorageTest.java | 2 +-
.../fluss/server/zk/ZooKeeperClientTest.java | 8 +-
.../fluss/server/zk/ZooKeeperExtension.java | 2 +-
.../zk/data/CoordinatorAddressJsonSerdeTest.java | 4 +-
.../zk/data/DatabaseRegistrationJsonSerdeTest.java | 3 +-
.../zk/data/TableRegistrationJsonSerdeTest.java | 2 +-
.../TabletServerRegistrationJsonSerdeTest.java | 4 +-
pom.xml | 14 ++--
tools/ci/fluss-ci-tools/pom.xml | 3 +-
.../tools/ci/utils/shared/DependencyTree.java | 2 +-
tools/ci/log4j.properties | 2 +-
200 files changed, 730 insertions(+), 642 deletions(-)
diff --git a/fluss-client/src/main/java/com/alibaba/fluss/client/write/RecordAccumulator.java b/fluss-client/src/main/java/com/alibaba/fluss/client/write/RecordAccumulator.java
index 65ac1b942..e0146b11f 100644
--- a/fluss-client/src/main/java/com/alibaba/fluss/client/write/RecordAccumulator.java
+++ b/fluss-client/src/main/java/com/alibaba/fluss/client/write/RecordAccumulator.java
@@ -35,12 +35,12 @@ import com.alibaba.fluss.metrics.MetricNames;
import com.alibaba.fluss.record.LogRecordBatch;
import com.alibaba.fluss.row.arrow.ArrowWriter;
import com.alibaba.fluss.row.arrow.ArrowWriterPool;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
import com.alibaba.fluss.utils.CopyOnWriteMap;
import com.alibaba.fluss.utils.MathUtils;
import com.alibaba.fluss.utils.clock.Clock;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-client/src/main/resources/META-INF/NOTICE b/fluss-client/src/main/resources/META-INF/NOTICE
index fd48d55f4..2f1d08de9 100644
--- a/fluss-client/src/main/resources/META-INF/NOTICE
+++ b/fluss-client/src/main/resources/META-INF/NOTICE
@@ -11,6 +11,10 @@ This project bundles the following dependencies under the Apache Software Licens
- org.apache.commons:commons-lang3:3.18.0
- org.apache.commons:commons-math3:3.6.1
- org.lz4:lz4-java:1.8.0
+- org.apache.fluss:fluss-shaded-arrow:15.0.0-1.0-incubating
+- org.apache.fluss:fluss-shaded-guava:32.1.3-jre-1.0-incubating
+- org.apache.fluss:fluss-shaded-jackson:2.15.3-1.0-incubating
+- org.apache.fluss:fluss-shaded-netty:4.1.104.Final-1.0-incubating
This project bundles the following dependencies under the MIT (https://opensource.org/licenses/MIT)
See bundled license files for details.
diff --git a/fluss-client/src/test/java/com/alibaba/fluss/client/security/acl/FlussAuthorizationITCase.java b/fluss-client/src/test/java/com/alibaba/fluss/client/security/acl/FlussAuthorizationITCase.java
index 7ba60d702..08d72e272 100644
--- a/fluss-client/src/test/java/com/alibaba/fluss/client/security/acl/FlussAuthorizationITCase.java
+++ b/fluss-client/src/test/java/com/alibaba/fluss/client/security/acl/FlussAuthorizationITCase.java
@@ -54,9 +54,9 @@ import com.alibaba.fluss.security.acl.PermissionType;
import com.alibaba.fluss.security.acl.Resource;
import com.alibaba.fluss.security.acl.ResourceFilter;
import com.alibaba.fluss.server.testutils.FlussClusterExtension;
-import com.alibaba.fluss.shaded.guava32.com.google.common.collect.Lists;
import com.alibaba.fluss.utils.CloseableIterator;
+import org.apache.fluss.shaded.guava32.com.google.common.collect.Lists;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-client/src/test/java/com/alibaba/fluss/client/write/ArrowLogWriteBatchTest.java b/fluss-client/src/test/java/com/alibaba/fluss/client/write/ArrowLogWriteBatchTest.java
index e2b88ab1b..a930bceff 100644
--- a/fluss-client/src/test/java/com/alibaba/fluss/client/write/ArrowLogWriteBatchTest.java
+++ b/fluss-client/src/test/java/com/alibaba/fluss/client/write/ArrowLogWriteBatchTest.java
@@ -30,11 +30,11 @@ import com.alibaba.fluss.record.bytesview.BytesView;
import com.alibaba.fluss.row.GenericRow;
import com.alibaba.fluss.row.arrow.ArrowWriter;
import com.alibaba.fluss.row.arrow.ArrowWriterPool;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
import com.alibaba.fluss.utils.CloseableIterator;
import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-common/pom.xml b/fluss-common/pom.xml
index e6cf4922c..d74e76bbc 100644
--- a/fluss-common/pom.xml
+++ b/fluss-common/pom.xml
@@ -42,23 +42,23 @@
</dependency>
<dependency>
- <groupId>com.alibaba.fluss</groupId>
+ <groupId>org.apache.fluss</groupId>
<artifactId>fluss-shaded-guava</artifactId>
</dependency>
<dependency>
- <groupId>com.alibaba.fluss</groupId>
+ <groupId>org.apache.fluss</groupId>
<artifactId>fluss-shaded-jackson</artifactId>
</dependency>
<!-- Netty dependencies used for LogRecords -->
<dependency>
- <groupId>com.alibaba.fluss</groupId>
+ <groupId>org.apache.fluss</groupId>
<artifactId>fluss-shaded-netty</artifactId>
</dependency>
<dependency>
- <groupId>com.alibaba.fluss</groupId>
+ <groupId>org.apache.fluss</groupId>
<artifactId>fluss-shaded-arrow</artifactId>
</dependency>
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/bucketing/IcebergBucketingFunction.java b/fluss-common/src/main/java/com/alibaba/fluss/bucketing/IcebergBucketingFunction.java
index 0325f3480..547a01dcb 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/bucketing/IcebergBucketingFunction.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/bucketing/IcebergBucketingFunction.java
@@ -17,8 +17,8 @@
package com.alibaba.fluss.bucketing;
-import com.alibaba.fluss.shaded.guava32.com.google.common.hash.HashFunction;
-import com.alibaba.fluss.shaded.guava32.com.google.common.hash.Hashing;
+import org.apache.fluss.shaded.guava32.com.google.common.hash.HashFunction;
+import org.apache.fluss.shaded.guava32.com.google.common.hash.Hashing;
/** An implementation of {@link BucketingFunction} to follow Iceberg's bucketing strategy. */
public class IcebergBucketingFunction implements BucketingFunction {
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/classloading/ComponentClassLoader.java b/fluss-common/src/main/java/com/alibaba/fluss/classloading/ComponentClassLoader.java
index c88dbbba8..a98fbed0d 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/classloading/ComponentClassLoader.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/classloading/ComponentClassLoader.java
@@ -18,9 +18,10 @@
package com.alibaba.fluss.classloading;
import com.alibaba.fluss.annotation.VisibleForTesting;
-import com.alibaba.fluss.shaded.guava32.com.google.common.collect.Iterators;
import com.alibaba.fluss.utils.function.FunctionWithException;
+import org.apache.fluss.shaded.guava32.com.google.common.collect.Iterators;
+
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/compression/ArrowCompressionFactory.java b/fluss-common/src/main/java/com/alibaba/fluss/compression/ArrowCompressionFactory.java
index 2314389cb..0910520f0 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/compression/ArrowCompressionFactory.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/compression/ArrowCompressionFactory.java
@@ -18,9 +18,10 @@
package com.alibaba.fluss.compression;
import com.alibaba.fluss.annotation.Internal;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionCodec;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionUtil;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.compression.NoCompressionCodec;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionCodec;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionUtil;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.NoCompressionCodec;
/* This file is based on source code of Apache Arrow-java Project (https://github.com/apache/arrow-java), licensed by
* the Apache Software Foundation (ASF) under the Apache License, Version 2.0. See the NOTICE file distributed with
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/compression/ArrowCompressionInfo.java b/fluss-common/src/main/java/com/alibaba/fluss/compression/ArrowCompressionInfo.java
index e26d1b335..4bcd2b3d3 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/compression/ArrowCompressionInfo.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/compression/ArrowCompressionInfo.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.compression;
import com.alibaba.fluss.config.ConfigOptions;
import com.alibaba.fluss.config.Configuration;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionCodec;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionCodec;
/** Compression information for Arrow record batches. */
public class ArrowCompressionInfo {
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/compression/Lz4ArrowCompressionCodec.java b/fluss-common/src/main/java/com/alibaba/fluss/compression/Lz4ArrowCompressionCodec.java
index 00805ac58..cf12cd347 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/compression/Lz4ArrowCompressionCodec.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/compression/Lz4ArrowCompressionCodec.java
@@ -17,12 +17,13 @@
package com.alibaba.fluss.compression;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.ArrowBuf;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.compression.AbstractCompressionCodec;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionUtil;
import com.alibaba.fluss.utils.IOUtils;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.ArrowBuf;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.AbstractCompressionCodec;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionUtil;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/compression/ZstdArrowCompressionCodec.java b/fluss-common/src/main/java/com/alibaba/fluss/compression/ZstdArrowCompressionCodec.java
index cd10a8344..630a23470 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/compression/ZstdArrowCompressionCodec.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/compression/ZstdArrowCompressionCodec.java
@@ -17,12 +17,11 @@
package com.alibaba.fluss.compression;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.ArrowBuf;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.compression.AbstractCompressionCodec;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionUtil;
-
import com.github.luben.zstd.Zstd;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.ArrowBuf;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.AbstractCompressionCodec;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionUtil;
import java.nio.ByteBuffer;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/fs/FileSystem.java b/fluss-common/src/main/java/com/alibaba/fluss/fs/FileSystem.java
index f5b0c62bf..ceb70cfba 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/fs/FileSystem.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/fs/FileSystem.java
@@ -24,12 +24,12 @@ import com.alibaba.fluss.fs.local.LocalFileSystem;
import com.alibaba.fluss.fs.local.LocalFileSystemPlugin;
import com.alibaba.fluss.fs.token.ObtainedSecurityToken;
import com.alibaba.fluss.plugin.PluginManager;
-import com.alibaba.fluss.shaded.guava32.com.google.common.collect.ImmutableMultimap;
-import com.alibaba.fluss.shaded.guava32.com.google.common.collect.Iterators;
-import com.alibaba.fluss.shaded.guava32.com.google.common.collect.Multimap;
import com.alibaba.fluss.utils.ExceptionUtils;
import com.alibaba.fluss.utils.TemporaryClassLoaderContext;
+import org.apache.fluss.shaded.guava32.com.google.common.collect.ImmutableMultimap;
+import org.apache.fluss.shaded.guava32.com.google.common.collect.Iterators;
+import org.apache.fluss.shaded.guava32.com.google.common.collect.Multimap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/fs/token/CredentialsJsonSerde.java b/fluss-common/src/main/java/com/alibaba/fluss/fs/token/CredentialsJsonSerde.java
index fe774ecd6..1cd541902 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/fs/token/CredentialsJsonSerde.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/fs/token/CredentialsJsonSerde.java
@@ -17,12 +17,13 @@
package com.alibaba.fluss.fs.token;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import com.alibaba.fluss.utils.json.JsonDeserializer;
import com.alibaba.fluss.utils.json.JsonSerdeUtils;
import com.alibaba.fluss.utils.json.JsonSerializer;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+
import java.io.IOException;
/** Json serializer and deserializer for {@link Credentials}. */
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/lake/lakestorage/LakeStoragePluginSetUp.java b/fluss-common/src/main/java/com/alibaba/fluss/lake/lakestorage/LakeStoragePluginSetUp.java
index 0e77baca4..2607a0502 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/lake/lakestorage/LakeStoragePluginSetUp.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/lake/lakestorage/LakeStoragePluginSetUp.java
@@ -18,7 +18,8 @@
package com.alibaba.fluss.lake.lakestorage;
import com.alibaba.fluss.plugin.PluginManager;
-import com.alibaba.fluss.shaded.guava32.com.google.common.collect.Iterators;
+
+import org.apache.fluss.shaded.guava32.com.google.common.collect.Iterators;
import javax.annotation.Nullable;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/metrics/reporter/ReporterSetup.java b/fluss-common/src/main/java/com/alibaba/fluss/metrics/reporter/ReporterSetup.java
index 9481590ce..43cdfbd9d 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/metrics/reporter/ReporterSetup.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/metrics/reporter/ReporterSetup.java
@@ -20,9 +20,9 @@ package com.alibaba.fluss.metrics.reporter;
import com.alibaba.fluss.config.ConfigOptions;
import com.alibaba.fluss.config.Configuration;
import com.alibaba.fluss.plugin.PluginManager;
-import com.alibaba.fluss.shaded.guava32.com.google.common.collect.Iterators;
import com.alibaba.fluss.utils.CollectionUtils;
+import org.apache.fluss.shaded.guava32.com.google.common.collect.Iterators;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/plugin/DefaultPluginManager.java b/fluss-common/src/main/java/com/alibaba/fluss/plugin/DefaultPluginManager.java
index a7a918525..26579e554 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/plugin/DefaultPluginManager.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/plugin/DefaultPluginManager.java
@@ -18,9 +18,9 @@
package com.alibaba.fluss.plugin;
import com.alibaba.fluss.annotation.Internal;
-import com.alibaba.fluss.shaded.guava32.com.google.common.base.Joiner;
-import com.alibaba.fluss.shaded.guava32.com.google.common.collect.Iterators;
+import org.apache.fluss.shaded.guava32.com.google.common.base.Joiner;
+import org.apache.fluss.shaded.guava32.com.google.common.collect.Iterators;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/record/BytesViewLogRecords.java b/fluss-common/src/main/java/com/alibaba/fluss/record/BytesViewLogRecords.java
index c30a52091..f16dcbd62 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/record/BytesViewLogRecords.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/record/BytesViewLogRecords.java
@@ -21,8 +21,9 @@ import com.alibaba.fluss.memory.MemorySegment;
import com.alibaba.fluss.record.bytesview.BytesView;
import com.alibaba.fluss.record.bytesview.MultiBytesView;
import com.alibaba.fluss.record.send.ByteBufWritableOutput;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.Unpooled;
+
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled;
import static com.alibaba.fluss.utils.Preconditions.checkState;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/record/DefaultLogRecordBatch.java b/fluss-common/src/main/java/com/alibaba/fluss/record/DefaultLogRecordBatch.java
index 6a821ad23..eb77c4bb2 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/record/DefaultLogRecordBatch.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/record/DefaultLogRecordBatch.java
@@ -23,8 +23,6 @@ import com.alibaba.fluss.exception.OutOfOrderSequenceException;
import com.alibaba.fluss.memory.MemorySegment;
import com.alibaba.fluss.metadata.LogFormat;
import com.alibaba.fluss.row.arrow.ArrowReader;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
import com.alibaba.fluss.types.DataType;
import com.alibaba.fluss.types.RowType;
import com.alibaba.fluss.utils.ArrowUtils;
@@ -32,6 +30,9 @@ import com.alibaba.fluss.utils.CloseableIterator;
import com.alibaba.fluss.utils.MurmurHashUtils;
import com.alibaba.fluss.utils.crc.Crc32C;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
+
import java.nio.ByteBuffer;
import java.util.NoSuchElementException;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/record/FileLogProjection.java b/fluss-common/src/main/java/com/alibaba/fluss/record/FileLogProjection.java
index 6d55c3580..84071a060 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/record/FileLogProjection.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/record/FileLogProjection.java
@@ -21,25 +21,26 @@ import com.alibaba.fluss.annotation.VisibleForTesting;
import com.alibaba.fluss.compression.ArrowCompressionInfo;
import com.alibaba.fluss.exception.InvalidColumnProjectionException;
import com.alibaba.fluss.record.bytesview.MultiBytesView;
-import com.alibaba.fluss.shaded.arrow.com.google.flatbuffers.FlatBufferBuilder;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.flatbuf.Buffer;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.flatbuf.FieldNode;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.flatbuf.Message;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.flatbuf.RecordBatch;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TypeLayout;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionUtil;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.WriteChannel;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowBodyCompression;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowBuffer;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowFieldNode;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.MessageSerializer;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Field;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Schema;
import com.alibaba.fluss.types.RowType;
import com.alibaba.fluss.utils.ArrowUtils;
import com.alibaba.fluss.utils.types.Tuple2;
+import org.apache.fluss.shaded.arrow.com.google.flatbuffers.FlatBufferBuilder;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.flatbuf.Buffer;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.flatbuf.FieldNode;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.flatbuf.Message;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.flatbuf.RecordBatch;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TypeLayout;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionUtil;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.WriteChannel;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowBodyCompression;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowBuffer;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowFieldNode;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.MessageSerializer;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Field;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Schema;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/record/LogRecordBatch.java b/fluss-common/src/main/java/com/alibaba/fluss/record/LogRecordBatch.java
index b4517105b..90b6b5b58 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/record/LogRecordBatch.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/record/LogRecordBatch.java
@@ -19,11 +19,12 @@ package com.alibaba.fluss.record;
import com.alibaba.fluss.annotation.PublicEvolving;
import com.alibaba.fluss.metadata.LogFormat;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
import com.alibaba.fluss.types.RowType;
import com.alibaba.fluss.utils.CloseableIterator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
+
import java.util.Iterator;
/**
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/record/LogRecordReadContext.java b/fluss-common/src/main/java/com/alibaba/fluss/record/LogRecordReadContext.java
index 5264a9661..7da48d685 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/record/LogRecordReadContext.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/record/LogRecordReadContext.java
@@ -22,14 +22,15 @@ import com.alibaba.fluss.metadata.LogFormat;
import com.alibaba.fluss.metadata.TableInfo;
import com.alibaba.fluss.row.InternalRow;
import com.alibaba.fluss.row.InternalRow.FieldGetter;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
import com.alibaba.fluss.types.DataType;
import com.alibaba.fluss.types.RowType;
import com.alibaba.fluss.utils.ArrowUtils;
import com.alibaba.fluss.utils.Projection;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
+
import javax.annotation.Nullable;
import java.util.List;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/ByteBufBytesView.java b/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/ByteBufBytesView.java
index ff6f9d7d7..39d24682e 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/ByteBufBytesView.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/ByteBufBytesView.java
@@ -17,8 +17,8 @@
package com.alibaba.fluss.record.bytesview;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.Unpooled;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled;
/** A {@link BytesView} that backends on a Netty {@link ByteBuf}. */
public class ByteBufBytesView implements BytesView {
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/BytesView.java b/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/BytesView.java
index 1abf0db97..1fac0bbbf 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/BytesView.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/BytesView.java
@@ -18,7 +18,8 @@
package com.alibaba.fluss.record.bytesview;
import com.alibaba.fluss.record.send.SendWritableOutput;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
/**
* A view of a sequential bytes. It might be a primitive byte array, a Netty ByteBuf, a byte
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/FileRegionBytesView.java b/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/FileRegionBytesView.java
index 858a31b89..dca9eae45 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/FileRegionBytesView.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/FileRegionBytesView.java
@@ -18,9 +18,10 @@
package com.alibaba.fluss.record.bytesview;
import com.alibaba.fluss.exception.FlussRuntimeException;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.Unpooled;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.FileRegion;
+
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled;
+import org.apache.fluss.shaded.netty4.io.netty.channel.FileRegion;
import java.io.IOException;
import java.nio.channels.FileChannel;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/FlussFileRegion.java b/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/FlussFileRegion.java
index 9cf0f5fc7..84004661e 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/FlussFileRegion.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/FlussFileRegion.java
@@ -17,18 +17,18 @@
package com.alibaba.fluss.record.bytesview;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.DefaultFileRegion;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.FileRegion;
-import com.alibaba.fluss.shaded.netty4.io.netty.util.AbstractReferenceCounted;
-import com.alibaba.fluss.shaded.netty4.io.netty.util.IllegalReferenceCountException;
-import com.alibaba.fluss.shaded.netty4.io.netty.util.internal.ObjectUtil;
+import org.apache.fluss.shaded.netty4.io.netty.channel.DefaultFileRegion;
+import org.apache.fluss.shaded.netty4.io.netty.channel.FileRegion;
+import org.apache.fluss.shaded.netty4.io.netty.util.AbstractReferenceCounted;
+import org.apache.fluss.shaded.netty4.io.netty.util.IllegalReferenceCountException;
+import org.apache.fluss.shaded.netty4.io.netty.util.internal.ObjectUtil;
import java.io.File;
import java.io.IOException;
import java.nio.channels.FileChannel;
import java.nio.channels.WritableByteChannel;
-import static com.alibaba.fluss.shaded.netty4.io.netty.util.internal.ObjectUtil.checkPositiveOrZero;
+import static org.apache.fluss.shaded.netty4.io.netty.util.internal.ObjectUtil.checkPositiveOrZero;
/**
* A {@link FileRegion} implementation which transfer data from a {@link FileChannel} or {@link
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/MemorySegmentBytesView.java b/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/MemorySegmentBytesView.java
index d5f30e113..200a5d814 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/MemorySegmentBytesView.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/MemorySegmentBytesView.java
@@ -18,8 +18,9 @@
package com.alibaba.fluss.record.bytesview;
import com.alibaba.fluss.memory.MemorySegment;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.Unpooled;
+
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled;
import java.nio.ByteBuffer;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/MultiBytesView.java b/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/MultiBytesView.java
index 5a1c273f3..c53917e4b 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/MultiBytesView.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/record/bytesview/MultiBytesView.java
@@ -20,8 +20,9 @@ package com.alibaba.fluss.record.bytesview;
import com.alibaba.fluss.annotation.VisibleForTesting;
import com.alibaba.fluss.memory.MemorySegment;
import com.alibaba.fluss.record.send.WritableOutput;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.Unpooled;
+
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled;
import java.nio.channels.FileChannel;
import java.util.ArrayList;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/record/send/ByteBufSend.java b/fluss-common/src/main/java/com/alibaba/fluss/record/send/ByteBufSend.java
index 8163fd88b..6f65d5dd5 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/record/send/ByteBufSend.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/record/send/ByteBufSend.java
@@ -17,8 +17,8 @@
package com.alibaba.fluss.record.send;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelOutboundInvoker;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelOutboundInvoker;
import java.io.IOException;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/record/send/ByteBufWritableOutput.java b/fluss-common/src/main/java/com/alibaba/fluss/record/send/ByteBufWritableOutput.java
index 7c01d9567..68065bc43 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/record/send/ByteBufWritableOutput.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/record/send/ByteBufWritableOutput.java
@@ -18,9 +18,10 @@
package com.alibaba.fluss.record.send;
import com.alibaba.fluss.record.bytesview.BytesView;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
import com.alibaba.fluss.utils.ProtoCodecUtils;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+
/**
* A basic implementation of {@link WritableOutput} that writes data into a {@link ByteBuf}.
*
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/record/send/FileRegionSend.java b/fluss-common/src/main/java/com/alibaba/fluss/record/send/FileRegionSend.java
index 1716ee1da..6e9d07cf0 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/record/send/FileRegionSend.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/record/send/FileRegionSend.java
@@ -17,8 +17,8 @@
package com.alibaba.fluss.record.send;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelOutboundInvoker;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.FileRegion;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelOutboundInvoker;
+import org.apache.fluss.shaded.netty4.io.netty.channel.FileRegion;
import java.io.IOException;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/record/send/MultiSend.java b/fluss-common/src/main/java/com/alibaba/fluss/record/send/MultiSend.java
index d9d2472e1..8b41ee417 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/record/send/MultiSend.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/record/send/MultiSend.java
@@ -17,7 +17,7 @@
package com.alibaba.fluss.record.send;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelOutboundInvoker;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelOutboundInvoker;
import java.io.IOException;
import java.util.Queue;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/record/send/Send.java b/fluss-common/src/main/java/com/alibaba/fluss/record/send/Send.java
index 25e74bb28..24f3e946e 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/record/send/Send.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/record/send/Send.java
@@ -17,7 +17,7 @@
package com.alibaba.fluss.record.send;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelOutboundInvoker;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelOutboundInvoker;
import java.io.IOException;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/record/send/SendWritableOutput.java b/fluss-common/src/main/java/com/alibaba/fluss/record/send/SendWritableOutput.java
index c22b56ff6..f91a81bf7 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/record/send/SendWritableOutput.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/record/send/SendWritableOutput.java
@@ -21,7 +21,8 @@ import com.alibaba.fluss.record.bytesview.BytesView;
import com.alibaba.fluss.record.bytesview.FileRegionBytesView;
import com.alibaba.fluss.record.bytesview.MemorySegmentBytesView;
import com.alibaba.fluss.record.bytesview.MultiBytesView;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
import java.util.ArrayDeque;
import java.util.Queue;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/record/send/WritableOutput.java b/fluss-common/src/main/java/com/alibaba/fluss/record/send/WritableOutput.java
index 727dec825..045fc4155 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/record/send/WritableOutput.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/record/send/WritableOutput.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.record.send;
import com.alibaba.fluss.record.bytesview.BytesView;
import com.alibaba.fluss.rpc.messages.ApiMessage;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
/** A writable output for writing {@link ApiMessage}. */
public interface WritableOutput {
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/ArrowReader.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/ArrowReader.java
index 9b92eea1f..604112c01 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/ArrowReader.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/ArrowReader.java
@@ -22,7 +22,8 @@ import com.alibaba.fluss.row.InternalRow;
import com.alibaba.fluss.row.columnar.ColumnVector;
import com.alibaba.fluss.row.columnar.ColumnarRow;
import com.alibaba.fluss.row.columnar.VectorizedColumnBatch;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
import static com.alibaba.fluss.utils.Preconditions.checkNotNull;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/ArrowWriter.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/ArrowWriter.java
index 360aabc41..b7c717a77 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/ArrowWriter.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/ArrowWriter.java
@@ -24,22 +24,23 @@ import com.alibaba.fluss.compression.ArrowCompressionRatioEstimator;
import com.alibaba.fluss.memory.AbstractPagedOutputView;
import com.alibaba.fluss.row.InternalRow;
import com.alibaba.fluss.row.arrow.writers.ArrowFieldWriter;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.BaseFixedWidthVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.BaseVariableWidthVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.FieldVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VectorUnloader;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionCodec;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionUtil;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.WriteChannel;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowBlock;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.MessageSerializer;
import com.alibaba.fluss.types.RowType;
import com.alibaba.fluss.utils.ArrowUtils;
import com.alibaba.fluss.utils.PagedMemorySegmentWritableChannel;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.BaseFixedWidthVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.BaseVariableWidthVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.FieldVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VectorUnloader;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionCodec;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionUtil;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.WriteChannel;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowBlock;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.MessageSerializer;
+
import java.io.IOException;
import static com.alibaba.fluss.utils.Preconditions.checkNotNull;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/ArrowWriterPool.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/ArrowWriterPool.java
index 356d83a2b..6cdf89c0e 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/ArrowWriterPool.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/ArrowWriterPool.java
@@ -22,10 +22,11 @@ import com.alibaba.fluss.annotation.VisibleForTesting;
import com.alibaba.fluss.compression.ArrowCompressionInfo;
import com.alibaba.fluss.compression.ArrowCompressionRatioEstimator;
import com.alibaba.fluss.exception.FlussRuntimeException;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
import com.alibaba.fluss.types.RowType;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
+
import javax.annotation.concurrent.GuardedBy;
import javax.annotation.concurrent.ThreadSafe;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowBigIntColumnVector.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowBigIntColumnVector.java
index 96bdf1f60..09ba44b66 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowBigIntColumnVector.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowBigIntColumnVector.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.row.arrow.vectors;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.columnar.LongColumnVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.BigIntVector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.BigIntVector;
import static com.alibaba.fluss.utils.Preconditions.checkNotNull;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowBinaryColumnVector.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowBinaryColumnVector.java
index 5676707c2..bcccc5208 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowBinaryColumnVector.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowBinaryColumnVector.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.row.arrow.vectors;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.columnar.BytesColumnVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.FixedSizeBinaryVector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.FixedSizeBinaryVector;
import static com.alibaba.fluss.utils.Preconditions.checkNotNull;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowBooleanColumnVector.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowBooleanColumnVector.java
index 948212a6a..6b8b672a6 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowBooleanColumnVector.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowBooleanColumnVector.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.row.arrow.vectors;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.columnar.BooleanColumnVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.BitVector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.BitVector;
import static com.alibaba.fluss.utils.Preconditions.checkNotNull;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowDateColumnVector.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowDateColumnVector.java
index a94a1431f..b3765d1ea 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowDateColumnVector.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowDateColumnVector.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.row.arrow.vectors;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.columnar.IntColumnVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.DateDayVector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.DateDayVector;
import static com.alibaba.fluss.utils.Preconditions.checkNotNull;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowDecimalColumnVector.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowDecimalColumnVector.java
index 14bde1303..017b0f215 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowDecimalColumnVector.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowDecimalColumnVector.java
@@ -20,7 +20,8 @@ package com.alibaba.fluss.row.arrow.vectors;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.Decimal;
import com.alibaba.fluss.row.columnar.DecimalColumnVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.DecimalVector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.DecimalVector;
import static com.alibaba.fluss.utils.Preconditions.checkNotNull;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowDoubleColumnVector.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowDoubleColumnVector.java
index fa7afdf10..a235a020d 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowDoubleColumnVector.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowDoubleColumnVector.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.row.arrow.vectors;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.columnar.DoubleColumnVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.Float8Vector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.Float8Vector;
import static com.alibaba.fluss.utils.Preconditions.checkNotNull;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowFloatColumnVector.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowFloatColumnVector.java
index dcf347f5b..d0974d58d 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowFloatColumnVector.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowFloatColumnVector.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.row.arrow.vectors;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.columnar.FloatColumnVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.Float4Vector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.Float4Vector;
import static com.alibaba.fluss.utils.Preconditions.checkNotNull;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowIntColumnVector.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowIntColumnVector.java
index 0daaf15e6..5482c1da9 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowIntColumnVector.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowIntColumnVector.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.row.arrow.vectors;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.columnar.IntColumnVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.IntVector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.IntVector;
import static com.alibaba.fluss.utils.Preconditions.checkNotNull;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowSmallIntColumnVector.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowSmallIntColumnVector.java
index 25909166b..6a363d732 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowSmallIntColumnVector.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowSmallIntColumnVector.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.row.arrow.vectors;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.columnar.ShortColumnVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.SmallIntVector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.SmallIntVector;
import static com.alibaba.fluss.utils.Preconditions.checkNotNull;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowTimeColumnVector.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowTimeColumnVector.java
index 2a504cbda..00a843a47 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowTimeColumnVector.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowTimeColumnVector.java
@@ -19,11 +19,12 @@ package com.alibaba.fluss.row.arrow.vectors;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.columnar.IntColumnVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeMicroVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeMilliVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeNanoVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeSecVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ValueVector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeMicroVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeMilliVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeNanoVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeSecVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ValueVector;
import static com.alibaba.fluss.utils.Preconditions.checkNotNull;
import static com.alibaba.fluss.utils.Preconditions.checkState;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowTimestampLtzColumnVector.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowTimestampLtzColumnVector.java
index 606833f52..5e9f56a7e 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowTimestampLtzColumnVector.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowTimestampLtzColumnVector.java
@@ -20,13 +20,14 @@ package com.alibaba.fluss.row.arrow.vectors;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.TimestampLtz;
import com.alibaba.fluss.row.columnar.TimestampLtzColumnVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampMicroVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampMilliVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampNanoVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampSecVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ValueVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.ArrowType;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampMicroVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampMilliVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampNanoVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampSecVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ValueVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.ArrowType;
import static com.alibaba.fluss.utils.Preconditions.checkNotNull;
import static com.alibaba.fluss.utils.Preconditions.checkState;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowTimestampNtzColumnVector.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowTimestampNtzColumnVector.java
index 8e29d3401..7cbd1aa28 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowTimestampNtzColumnVector.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowTimestampNtzColumnVector.java
@@ -20,13 +20,14 @@ package com.alibaba.fluss.row.arrow.vectors;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.TimestampNtz;
import com.alibaba.fluss.row.columnar.TimestampNtzColumnVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampMicroVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampMilliVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampNanoVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampSecVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ValueVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.ArrowType;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampMicroVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampMilliVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampNanoVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampSecVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ValueVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.ArrowType;
import static com.alibaba.fluss.utils.Preconditions.checkNotNull;
import static com.alibaba.fluss.utils.Preconditions.checkState;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowTinyIntColumnVector.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowTinyIntColumnVector.java
index d979fa2e6..658b9f4dd 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowTinyIntColumnVector.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowTinyIntColumnVector.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.row.arrow.vectors;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.columnar.ByteColumnVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TinyIntVector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TinyIntVector;
import static com.alibaba.fluss.utils.Preconditions.checkNotNull;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowVarBinaryColumnVector.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowVarBinaryColumnVector.java
index 5114533d2..8511e65ba 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowVarBinaryColumnVector.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowVarBinaryColumnVector.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.row.arrow.vectors;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.columnar.BytesColumnVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VarBinaryVector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VarBinaryVector;
import static com.alibaba.fluss.utils.Preconditions.checkNotNull;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowVarCharColumnVector.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowVarCharColumnVector.java
index df35eeac7..7c3ac9b74 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowVarCharColumnVector.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/vectors/ArrowVarCharColumnVector.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.row.arrow.vectors;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.columnar.BytesColumnVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VarCharVector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VarCharVector;
import static com.alibaba.fluss.utils.Preconditions.checkNotNull;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowBigIntWriter.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowBigIntWriter.java
index 8ee0dd2f8..e36a20ad8 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowBigIntWriter.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowBigIntWriter.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.row.arrow.writers;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.InternalRow;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.BigIntVector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.BigIntVector;
/** {@link ArrowFieldWriter} for BigInt. */
@Internal
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowBinaryWriter.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowBinaryWriter.java
index 1c21da28e..f2ffc3900 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowBinaryWriter.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowBinaryWriter.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.row.arrow.writers;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.InternalRow;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.FixedSizeBinaryVector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.FixedSizeBinaryVector;
/** {@link ArrowFieldWriter} for Binary. */
@Internal
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowBooleanWriter.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowBooleanWriter.java
index 0daa34ee6..1461ee037 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowBooleanWriter.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowBooleanWriter.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.row.arrow.writers;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.InternalRow;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.BitVector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.BitVector;
/** {@link ArrowFieldWriter} for Boolean. */
@Internal
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowDateWriter.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowDateWriter.java
index 3fdf7a075..ea2bf6140 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowDateWriter.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowDateWriter.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.row.arrow.writers;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.InternalRow;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.DateDayVector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.DateDayVector;
/** {@link ArrowFieldWriter} for Date. */
@Internal
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowDecimalWriter.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowDecimalWriter.java
index e261dd3e3..1a0b454ef 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowDecimalWriter.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowDecimalWriter.java
@@ -20,7 +20,8 @@ package com.alibaba.fluss.row.arrow.writers;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.Decimal;
import com.alibaba.fluss.row.InternalRow;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.DecimalVector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.DecimalVector;
import java.math.BigDecimal;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowDoubleWriter.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowDoubleWriter.java
index 055d56f50..8457386a5 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowDoubleWriter.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowDoubleWriter.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.row.arrow.writers;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.InternalRow;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.Float8Vector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.Float8Vector;
/** {@link ArrowFieldWriter} for Double. */
@Internal
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowFieldWriter.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowFieldWriter.java
index 984ad28ab..8ff75ddd8 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowFieldWriter.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowFieldWriter.java
@@ -18,7 +18,8 @@
package com.alibaba.fluss.row.arrow.writers;
import com.alibaba.fluss.annotation.Internal;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ValueVector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ValueVector;
import static com.alibaba.fluss.utils.Preconditions.checkNotNull;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowFloatWriter.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowFloatWriter.java
index daf2407fe..cc618486c 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowFloatWriter.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowFloatWriter.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.row.arrow.writers;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.InternalRow;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.Float4Vector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.Float4Vector;
/** {@link ArrowFieldWriter} for Float. */
@Internal
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowIntWriter.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowIntWriter.java
index f539ec743..811d8f86c 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowIntWriter.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowIntWriter.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.row.arrow.writers;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.InternalRow;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.IntVector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.IntVector;
/** {@link ArrowFieldWriter} for Int. */
@Internal
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowSmallIntWriter.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowSmallIntWriter.java
index c795e1613..2e0bfd5ca 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowSmallIntWriter.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowSmallIntWriter.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.row.arrow.writers;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.InternalRow;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.SmallIntVector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.SmallIntVector;
/** {@link ArrowFieldWriter} for SmallInt. */
@Internal
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowTimeWriter.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowTimeWriter.java
index 496b62b43..eb795b519 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowTimeWriter.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowTimeWriter.java
@@ -19,12 +19,13 @@ package com.alibaba.fluss.row.arrow.writers;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.InternalRow;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.BaseFixedWidthVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeMicroVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeMilliVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeNanoVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeSecVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ValueVector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.BaseFixedWidthVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeMicroVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeMilliVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeNanoVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeSecVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ValueVector;
import static com.alibaba.fluss.utils.Preconditions.checkState;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowTimestampLtzWriter.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowTimestampLtzWriter.java
index f2f23699e..6e765218b 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowTimestampLtzWriter.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowTimestampLtzWriter.java
@@ -20,12 +20,13 @@ package com.alibaba.fluss.row.arrow.writers;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.InternalRow;
import com.alibaba.fluss.row.TimestampLtz;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampMicroVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampMilliVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampSecVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ValueVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.ArrowType;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampMicroVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampMilliVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampSecVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ValueVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.ArrowType;
import static com.alibaba.fluss.utils.Preconditions.checkState;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowTimestampNtzWriter.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowTimestampNtzWriter.java
index 488aed6b6..5cc625a7c 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowTimestampNtzWriter.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowTimestampNtzWriter.java
@@ -20,12 +20,13 @@ package com.alibaba.fluss.row.arrow.writers;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.InternalRow;
import com.alibaba.fluss.row.TimestampNtz;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampMicroVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampMilliVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampSecVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ValueVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.ArrowType;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampMicroVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampMilliVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampSecVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ValueVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.ArrowType;
import static com.alibaba.fluss.utils.Preconditions.checkState;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowTinyIntWriter.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowTinyIntWriter.java
index 85d2721a8..d8cc5175e 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowTinyIntWriter.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowTinyIntWriter.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.row.arrow.writers;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.InternalRow;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TinyIntVector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TinyIntVector;
/** {@link ArrowFieldWriter} for TinyInt. */
@Internal
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowVarBinaryWriter.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowVarBinaryWriter.java
index 185ccbcb2..308600793 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowVarBinaryWriter.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowVarBinaryWriter.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.row.arrow.writers;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.InternalRow;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VarBinaryVector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VarBinaryVector;
/** {@link ArrowFieldWriter} for VarBinary. */
@Internal
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowVarCharWriter.java b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowVarCharWriter.java
index ffe0a243b..782759444 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowVarCharWriter.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/row/arrow/writers/ArrowVarCharWriter.java
@@ -20,7 +20,8 @@ package com.alibaba.fluss.row.arrow.writers;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.row.BinaryString;
import com.alibaba.fluss.row.InternalRow;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VarCharVector;
+
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VarCharVector;
import java.nio.ByteBuffer;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/rpc/messages/ApiMessage.java b/fluss-common/src/main/java/com/alibaba/fluss/rpc/messages/ApiMessage.java
index dad17497f..db8235acc 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/rpc/messages/ApiMessage.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/rpc/messages/ApiMessage.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.rpc.messages;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.record.send.WritableOutput;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
/**
* An object that can serialize itself. The serialization protocol is versioned. Messages also
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/utils/ArrowUtils.java b/fluss-common/src/main/java/com/alibaba/fluss/utils/ArrowUtils.java
index aba574a38..0d08f453e 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/utils/ArrowUtils.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/utils/ArrowUtils.java
@@ -55,51 +55,6 @@ import com.alibaba.fluss.row.arrow.writers.ArrowTinyIntWriter;
import com.alibaba.fluss.row.arrow.writers.ArrowVarBinaryWriter;
import com.alibaba.fluss.row.arrow.writers.ArrowVarCharWriter;
import com.alibaba.fluss.row.columnar.ColumnVector;
-import com.alibaba.fluss.shaded.arrow.com.google.flatbuffers.FlatBufferBuilder;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.flatbuf.MessageHeader;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.flatbuf.RecordBatch;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.ArrowBuf;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.BigIntVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.BitVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.DateDayVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.DecimalVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.FieldVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.FixedSizeBinaryVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.Float4Vector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.Float8Vector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.IntVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.SmallIntVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeMicroVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeMilliVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeNanoVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeSecVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TinyIntVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TypeLayout;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ValueVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VarBinaryVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VarCharVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VectorLoader;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.compression.NoCompressionCodec;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.ReadChannel;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.WriteChannel;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowBodyCompression;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowBuffer;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowFieldNode;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.FBSerializables;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.IpcOption;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.MessageSerializer;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.DateUnit;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.FloatingPointPrecision;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.TimeUnit;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.ArrowType;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Field;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.FieldType;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Schema;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.util.DataSizeRoundingUtil;
import com.alibaba.fluss.types.BigIntType;
import com.alibaba.fluss.types.BinaryType;
import com.alibaba.fluss.types.BooleanType;
@@ -120,6 +75,52 @@ import com.alibaba.fluss.types.TimeType;
import com.alibaba.fluss.types.TimestampType;
import com.alibaba.fluss.types.TinyIntType;
+import org.apache.fluss.shaded.arrow.com.google.flatbuffers.FlatBufferBuilder;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.flatbuf.MessageHeader;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.flatbuf.RecordBatch;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.ArrowBuf;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.BigIntVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.BitVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.DateDayVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.DecimalVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.FieldVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.FixedSizeBinaryVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.Float4Vector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.Float8Vector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.IntVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.SmallIntVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeMicroVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeMilliVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeNanoVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeSecVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TinyIntVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TypeLayout;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ValueVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VarBinaryVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VarCharVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VectorLoader;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.NoCompressionCodec;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.ReadChannel;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.WriteChannel;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowBodyCompression;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowBuffer;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowFieldNode;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.FBSerializables;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.IpcOption;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.MessageSerializer;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.DateUnit;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.FloatingPointPrecision;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.TimeUnit;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.ArrowType;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Field;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.FieldType;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Schema;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.util.DataSizeRoundingUtil;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -128,8 +129,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
-import static com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.MessageSerializer.deserializeRecordBatch;
import static com.alibaba.fluss.utils.Preconditions.checkArgument;
+import static org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.MessageSerializer.deserializeRecordBatch;
/** Utilities for Arrow. */
@Internal
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/utils/CloseableRegistry.java b/fluss-common/src/main/java/com/alibaba/fluss/utils/CloseableRegistry.java
index c49bf2448..69bfcd403 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/utils/CloseableRegistry.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/utils/CloseableRegistry.java
@@ -27,7 +27,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import static com.alibaba.fluss.shaded.guava32.com.google.common.collect.Lists.reverse;
+import static org.apache.fluss.shaded.guava32.com.google.common.collect.Lists.reverse;
/**
* This class allows to register instances of {@link Closeable}, which are all closed if this
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/utils/NetUtils.java b/fluss-common/src/main/java/com/alibaba/fluss/utils/NetUtils.java
index 77cf478e5..204b3a92c 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/utils/NetUtils.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/utils/NetUtils.java
@@ -19,7 +19,8 @@ package com.alibaba.fluss.utils;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.exception.IllegalConfigurationException;
-import com.alibaba.fluss.shaded.guava32.com.google.common.net.InetAddresses;
+
+import org.apache.fluss.shaded.guava32.com.google.common.net.InetAddresses;
import java.io.IOException;
import java.net.Inet6Address;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/utils/ProtoCodecUtils.java b/fluss-common/src/main/java/com/alibaba/fluss/utils/ProtoCodecUtils.java
index 2a27918d7..b2212ff83 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/utils/ProtoCodecUtils.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/utils/ProtoCodecUtils.java
@@ -19,8 +19,8 @@
package com.alibaba.fluss.utils;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBufUtil;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBufUtil;
import java.nio.charset.StandardCharsets;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/utils/json/BucketOffsetJsonSerde.java b/fluss-common/src/main/java/com/alibaba/fluss/utils/json/BucketOffsetJsonSerde.java
index 819e2f09f..6a1bb1ebe 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/utils/json/BucketOffsetJsonSerde.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/utils/json/BucketOffsetJsonSerde.java
@@ -18,8 +18,9 @@
package com.alibaba.fluss.utils.json;
import com.alibaba.fluss.lake.committer.BucketOffset;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import java.io.IOException;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/utils/json/ColumnJsonSerde.java b/fluss-common/src/main/java/com/alibaba/fluss/utils/json/ColumnJsonSerde.java
index 984fe905a..7df77be2f 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/utils/json/ColumnJsonSerde.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/utils/json/ColumnJsonSerde.java
@@ -19,10 +19,11 @@ package com.alibaba.fluss.utils.json;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.metadata.Schema;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import com.alibaba.fluss.types.DataType;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+
import java.io.IOException;
/** Json serializer and deserializer for {@link Schema.Column}. */
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/utils/json/DataTypeJsonSerde.java b/fluss-common/src/main/java/com/alibaba/fluss/utils/json/DataTypeJsonSerde.java
index b445a156b..944e991fd 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/utils/json/DataTypeJsonSerde.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/utils/json/DataTypeJsonSerde.java
@@ -19,9 +19,6 @@ package com.alibaba.fluss.utils.json;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.metadata.TableException;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.node.ArrayNode;
import com.alibaba.fluss.types.ArrayType;
import com.alibaba.fluss.types.DataField;
import com.alibaba.fluss.types.DataType;
@@ -34,6 +31,10 @@ import com.alibaba.fluss.types.RowType;
import com.alibaba.fluss.types.TimeType;
import com.alibaba.fluss.types.TimestampType;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.node.ArrayNode;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/utils/json/DatabaseDescriptorJsonSerde.java b/fluss-common/src/main/java/com/alibaba/fluss/utils/json/DatabaseDescriptorJsonSerde.java
index 4531b85de..2231b319e 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/utils/json/DatabaseDescriptorJsonSerde.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/utils/json/DatabaseDescriptorJsonSerde.java
@@ -18,8 +18,9 @@
package com.alibaba.fluss.utils.json;
import com.alibaba.fluss.metadata.DatabaseDescriptor;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import java.io.IOException;
import java.util.HashMap;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/utils/json/JsonDeserializer.java b/fluss-common/src/main/java/com/alibaba/fluss/utils/json/JsonDeserializer.java
index 97d989358..80c6d17a5 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/utils/json/JsonDeserializer.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/utils/json/JsonDeserializer.java
@@ -17,7 +17,7 @@
package com.alibaba.fluss.utils.json;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
/** Json deserializer for jackson. */
public interface JsonDeserializer<T> {
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/utils/json/JsonSerdeUtils.java b/fluss-common/src/main/java/com/alibaba/fluss/utils/json/JsonSerdeUtils.java
index 5575515cc..0ea5b6232 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/utils/json/JsonSerdeUtils.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/utils/json/JsonSerdeUtils.java
@@ -18,11 +18,12 @@
package com.alibaba.fluss.utils.json;
import com.alibaba.fluss.annotation.Internal;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonEncoding;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.util.ByteArrayBuilder;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonEncoding;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.util.ByteArrayBuilder;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.io.UncheckedIOException;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/utils/json/JsonSerializer.java b/fluss-common/src/main/java/com/alibaba/fluss/utils/json/JsonSerializer.java
index 8975a7574..b5ee0e36f 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/utils/json/JsonSerializer.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/utils/json/JsonSerializer.java
@@ -17,7 +17,7 @@
package com.alibaba.fluss.utils.json;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
import java.io.IOException;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/utils/json/SchemaJsonSerde.java b/fluss-common/src/main/java/com/alibaba/fluss/utils/json/SchemaJsonSerde.java
index 6f1cc35f6..c9575ea31 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/utils/json/SchemaJsonSerde.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/utils/json/SchemaJsonSerde.java
@@ -19,8 +19,9 @@ package com.alibaba.fluss.utils.json;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.metadata.Schema;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/utils/json/TableDescriptorJsonSerde.java b/fluss-common/src/main/java/com/alibaba/fluss/utils/json/TableDescriptorJsonSerde.java
index b56ee39ae..55408b394 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/utils/json/TableDescriptorJsonSerde.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/utils/json/TableDescriptorJsonSerde.java
@@ -20,8 +20,9 @@ package com.alibaba.fluss.utils.json;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.metadata.Schema;
import com.alibaba.fluss.metadata.TableDescriptor;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/utils/json/TablePartitionJsonSerde.java b/fluss-common/src/main/java/com/alibaba/fluss/utils/json/TablePartitionJsonSerde.java
index 2dda41fb8..8c9560ed0 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/utils/json/TablePartitionJsonSerde.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/utils/json/TablePartitionJsonSerde.java
@@ -19,8 +19,9 @@ package com.alibaba.fluss.utils.json;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.metadata.TablePartition;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import java.io.IOException;
diff --git a/fluss-common/src/test/java/com/alibaba/fluss/compression/ArrowCompressionCodecTest.java b/fluss-common/src/test/java/com/alibaba/fluss/compression/ArrowCompressionCodecTest.java
index 4027244a1..57ec03436 100644
--- a/fluss-common/src/test/java/com/alibaba/fluss/compression/ArrowCompressionCodecTest.java
+++ b/fluss-common/src/test/java/com/alibaba/fluss/compression/ArrowCompressionCodecTest.java
@@ -17,24 +17,23 @@
package com.alibaba.fluss.compression;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.ArrowBuf;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.util.AutoCloseables;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.FieldVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.IntVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VarBinaryVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VarCharVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VectorUnloader;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionCodec;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionUtil;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.compression.NoCompressionCodec;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowFieldNode;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.ArrowType;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Field;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Schema;
-
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.ArrowBuf;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.util.AutoCloseables;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.FieldVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.IntVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VarBinaryVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VarCharVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VectorUnloader;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionCodec;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionUtil;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.NoCompressionCodec;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowFieldNode;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.ArrowType;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Field;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Schema;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
diff --git a/fluss-common/src/test/java/com/alibaba/fluss/plugin/DefaultPluginManagerTest.java b/fluss-common/src/test/java/com/alibaba/fluss/plugin/DefaultPluginManagerTest.java
index 5a8996900..1abaeefb7 100644
--- a/fluss-common/src/test/java/com/alibaba/fluss/plugin/DefaultPluginManagerTest.java
+++ b/fluss-common/src/test/java/com/alibaba/fluss/plugin/DefaultPluginManagerTest.java
@@ -18,8 +18,8 @@
package com.alibaba.fluss.plugin;
import com.alibaba.fluss.plugin.jar.pluginb.TestServiceB;
-import com.alibaba.fluss.shaded.guava32.com.google.common.collect.Lists;
+import org.apache.fluss.shaded.guava32.com.google.common.collect.Lists;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
diff --git a/fluss-common/src/test/java/com/alibaba/fluss/record/FileLogRecordsTest.java b/fluss-common/src/test/java/com/alibaba/fluss/record/FileLogRecordsTest.java
index 9cbc5f637..80551c863 100644
--- a/fluss-common/src/test/java/com/alibaba/fluss/record/FileLogRecordsTest.java
+++ b/fluss-common/src/test/java/com/alibaba/fluss/record/FileLogRecordsTest.java
@@ -38,11 +38,11 @@ import java.util.concurrent.Future;
import static com.alibaba.fluss.record.TestData.DATA1;
import static com.alibaba.fluss.record.TestData.DATA1_ROW_TYPE;
-import static com.alibaba.fluss.shaded.guava32.com.google.common.collect.Lists.newArrayList;
import static com.alibaba.fluss.testutils.DataTestUtils.assertLogRecordBatchEquals;
import static com.alibaba.fluss.testutils.DataTestUtils.assertLogRecordsEquals;
import static com.alibaba.fluss.testutils.DataTestUtils.genLogRecordsWithBaseOffsetAndTimestamp;
import static com.alibaba.fluss.testutils.DataTestUtils.genMemoryLogRecordsWithBaseOffset;
+import static org.apache.fluss.shaded.guava32.com.google.common.collect.Lists.newArrayList;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.anyLong;
diff --git a/fluss-common/src/test/java/com/alibaba/fluss/record/MemoryLogRecordsArrowBuilderTest.java b/fluss-common/src/test/java/com/alibaba/fluss/record/MemoryLogRecordsArrowBuilderTest.java
index 246b93da5..575afad0f 100644
--- a/fluss-common/src/test/java/com/alibaba/fluss/record/MemoryLogRecordsArrowBuilderTest.java
+++ b/fluss-common/src/test/java/com/alibaba/fluss/record/MemoryLogRecordsArrowBuilderTest.java
@@ -27,13 +27,13 @@ import com.alibaba.fluss.memory.TestingMemorySegmentPool;
import com.alibaba.fluss.row.InternalRow;
import com.alibaba.fluss.row.arrow.ArrowWriter;
import com.alibaba.fluss.row.arrow.ArrowWriterPool;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
import com.alibaba.fluss.testutils.DataTestUtils;
import com.alibaba.fluss.utils.CloseableIterator;
import org.apache.commons.lang3.RandomUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-common/src/test/java/com/alibaba/fluss/record/send/SendWritableOutputTest.java b/fluss-common/src/test/java/com/alibaba/fluss/record/send/SendWritableOutputTest.java
index 4f9025231..ea1f8a15c 100644
--- a/fluss-common/src/test/java/com/alibaba/fluss/record/send/SendWritableOutputTest.java
+++ b/fluss-common/src/test/java/com/alibaba/fluss/record/send/SendWritableOutputTest.java
@@ -22,9 +22,9 @@ import com.alibaba.fluss.record.bytesview.FileRegionBytesView;
import com.alibaba.fluss.record.bytesview.MemorySegmentBytesView;
import com.alibaba.fluss.record.bytesview.MultiBytesView;
import com.alibaba.fluss.row.BinaryString;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.Unpooled;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
diff --git a/fluss-common/src/test/java/com/alibaba/fluss/row/arrow/ArrowReaderWriterTest.java b/fluss-common/src/test/java/com/alibaba/fluss/row/arrow/ArrowReaderWriterTest.java
index b1bab31c4..9ba6f518f 100644
--- a/fluss-common/src/test/java/com/alibaba/fluss/row/arrow/ArrowReaderWriterTest.java
+++ b/fluss-common/src/test/java/com/alibaba/fluss/row/arrow/ArrowReaderWriterTest.java
@@ -28,14 +28,14 @@ import com.alibaba.fluss.row.InternalRow;
import com.alibaba.fluss.row.TimestampLtz;
import com.alibaba.fluss.row.TimestampNtz;
import com.alibaba.fluss.row.columnar.ColumnarRow;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
import com.alibaba.fluss.types.DataType;
import com.alibaba.fluss.types.DataTypes;
import com.alibaba.fluss.types.RowType;
import com.alibaba.fluss.utils.ArrowUtils;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/fluss-common/src/test/java/com/alibaba/fluss/row/arrow/ArrowWriterPoolTest.java b/fluss-common/src/test/java/com/alibaba/fluss/row/arrow/ArrowWriterPoolTest.java
index de5021628..815df5562 100644
--- a/fluss-common/src/test/java/com/alibaba/fluss/row/arrow/ArrowWriterPoolTest.java
+++ b/fluss-common/src/test/java/com/alibaba/fluss/row/arrow/ArrowWriterPoolTest.java
@@ -17,9 +17,8 @@
package com.alibaba.fluss.row.arrow;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
-
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-common/src/test/java/com/alibaba/fluss/testutils/ByteBufChannel.java b/fluss-common/src/test/java/com/alibaba/fluss/testutils/ByteBufChannel.java
index e487370d3..51653b97b 100644
--- a/fluss-common/src/test/java/com/alibaba/fluss/testutils/ByteBufChannel.java
+++ b/fluss-common/src/test/java/com/alibaba/fluss/testutils/ByteBufChannel.java
@@ -18,13 +18,14 @@
package com.alibaba.fluss.testutils;
import com.alibaba.fluss.record.send.Send;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelFuture;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelOutboundInvoker;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelProgressivePromise;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelPromise;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.FileRegion;
-import com.alibaba.fluss.shaded.netty4.io.netty.util.ReferenceCountUtil;
+
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelFuture;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelOutboundInvoker;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelProgressivePromise;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelPromise;
+import org.apache.fluss.shaded.netty4.io.netty.channel.FileRegion;
+import org.apache.fluss.shaded.netty4.io.netty.util.ReferenceCountUtil;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -33,7 +34,7 @@ import java.nio.ByteBuffer;
import java.nio.channels.Channels;
import java.nio.channels.WritableByteChannel;
-import static com.alibaba.fluss.shaded.netty4.io.netty.buffer.Unpooled.wrappedBuffer;
+import static org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled.wrappedBuffer;
/** A testing implementation of {@link ChannelOutboundInvoker} that writes to a {@link ByteBuf}. */
public class ByteBufChannel implements ChannelOutboundInvoker {
diff --git a/fluss-common/src/test/java/com/alibaba/fluss/testutils/DataTestUtils.java b/fluss-common/src/test/java/com/alibaba/fluss/testutils/DataTestUtils.java
index b995bbb53..0910e09bf 100644
--- a/fluss-common/src/test/java/com/alibaba/fluss/testutils/DataTestUtils.java
+++ b/fluss-common/src/test/java/com/alibaba/fluss/testutils/DataTestUtils.java
@@ -53,8 +53,6 @@ import com.alibaba.fluss.row.encode.CompactedRowEncoder;
import com.alibaba.fluss.row.encode.RowEncoder;
import com.alibaba.fluss.row.encode.ValueEncoder;
import com.alibaba.fluss.row.indexed.IndexedRow;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
import com.alibaba.fluss.types.DataType;
import com.alibaba.fluss.types.DataTypeRoot;
import com.alibaba.fluss.types.RowType;
@@ -63,6 +61,9 @@ import com.alibaba.fluss.utils.CloseableIterator;
import com.alibaba.fluss.utils.FlussPaths;
import com.alibaba.fluss.utils.types.Tuple2;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
+
import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/fluss-common/src/test/java/com/alibaba/fluss/utils/ArrowUtilsTest.java b/fluss-common/src/test/java/com/alibaba/fluss/utils/ArrowUtilsTest.java
index 0522f3a7e..e90148574 100644
--- a/fluss-common/src/test/java/com/alibaba/fluss/utils/ArrowUtilsTest.java
+++ b/fluss-common/src/test/java/com/alibaba/fluss/utils/ArrowUtilsTest.java
@@ -17,29 +17,6 @@
package com.alibaba.fluss.utils;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.BigIntVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.BitVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.DateDayVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.FieldVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.Float4Vector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.Float8Vector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.IntVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.SmallIntVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeSecVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.TinyIntVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VarBinaryVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VarCharVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VectorUnloader;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.WriteChannel;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowBlock;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.MessageSerializer;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Schema;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.util.Text;
import com.alibaba.fluss.types.DataField;
import com.alibaba.fluss.types.DataType;
import com.alibaba.fluss.types.DataTypes;
@@ -47,6 +24,29 @@ import com.alibaba.fluss.types.RowType;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.RandomUtils;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.BigIntVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.BitVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.DateDayVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.FieldVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.Float4Vector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.Float8Vector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.IntVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.SmallIntVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeSecVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TimeStampVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.TinyIntVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VarBinaryVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VarCharVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VectorUnloader;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.WriteChannel;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowBlock;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.MessageSerializer;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Schema;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.util.Text;
import org.junit.jupiter.api.Test;
import java.io.ByteArrayOutputStream;
@@ -56,7 +56,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import static com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.compression.NoCompressionCodec.DEFAULT_BODY_COMPRESSION;
+import static org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.NoCompressionCodec.DEFAULT_BODY_COMPRESSION;
import static org.assertj.core.api.Assertions.assertThat;
/** Tests for {@link com.alibaba.fluss.utils.ArrowUtils}. */
diff --git a/fluss-common/src/test/java/com/alibaba/fluss/utils/ProtoCodecUtilsTest.java b/fluss-common/src/test/java/com/alibaba/fluss/utils/ProtoCodecUtilsTest.java
index 27f33f529..5e9a1d566 100644
--- a/fluss-common/src/test/java/com/alibaba/fluss/utils/ProtoCodecUtilsTest.java
+++ b/fluss-common/src/test/java/com/alibaba/fluss/utils/ProtoCodecUtilsTest.java
@@ -17,11 +17,10 @@
package com.alibaba.fluss.utils;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.Unpooled;
-
import com.google.protobuf.CodedInputStream;
import com.google.protobuf.CodedOutputStream;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
diff --git a/fluss-common/src/test/java/com/alibaba/fluss/utils/json/JsonSerdeTestBase.java b/fluss-common/src/test/java/com/alibaba/fluss/utils/json/JsonSerdeTestBase.java
index 7d18462e1..a8233a61e 100644
--- a/fluss-common/src/test/java/com/alibaba/fluss/utils/json/JsonSerdeTestBase.java
+++ b/fluss-common/src/test/java/com/alibaba/fluss/utils/json/JsonSerdeTestBase.java
@@ -17,8 +17,7 @@
package com.alibaba.fluss.utils.json;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
-
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/fluss-dist/src/main/resources/bin/fluss-daemon.sh b/fluss-dist/src/main/resources/bin/fluss-daemon.sh
index c04ead333..a67ab401d 100755
--- a/fluss-dist/src/main/resources/bin/fluss-daemon.sh
+++ b/fluss-dist/src/main/resources/bin/fluss-daemon.sh
@@ -39,7 +39,7 @@ case $DAEMON in
;;
(zookeeper)
- CLASS_TO_RUN=com.alibaba.fluss.shaded.zookeeper3.org.apache.zookeeper.server.quorum.QuorumPeerMain
+ CLASS_TO_RUN=org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.server.quorum.QuorumPeerMain
;;
(*)
diff --git a/fluss-filesystems/fluss-fs-gs/src/test/java/com/alibaba/fluss/fs/gs/AuthServerHandler.java b/fluss-filesystems/fluss-fs-gs/src/test/java/com/alibaba/fluss/fs/gs/AuthServerHandler.java
index 888049dea..a715c7345 100644
--- a/fluss-filesystems/fluss-fs-gs/src/test/java/com/alibaba/fluss/fs/gs/AuthServerHandler.java
+++ b/fluss-filesystems/fluss-fs-gs/src/test/java/com/alibaba/fluss/fs/gs/AuthServerHandler.java
@@ -17,31 +17,32 @@
package com.alibaba.fluss.fs.gs;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.Unpooled;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.SimpleChannelInboundHandler;
-import com.alibaba.fluss.shaded.netty4.io.netty.handler.codec.http.DefaultFullHttpResponse;
-import com.alibaba.fluss.shaded.netty4.io.netty.handler.codec.http.FullHttpResponse;
-import com.alibaba.fluss.shaded.netty4.io.netty.handler.codec.http.HttpMethod;
-import com.alibaba.fluss.shaded.netty4.io.netty.handler.codec.http.HttpObject;
-import com.alibaba.fluss.shaded.netty4.io.netty.handler.codec.http.HttpRequest;
-import com.alibaba.fluss.shaded.netty4.io.netty.handler.codec.http.HttpResponseStatus;
-import com.alibaba.fluss.shaded.netty4.io.netty.util.AsciiString;
import com.alibaba.fluss.utils.IOUtils;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
+import org.apache.fluss.shaded.netty4.io.netty.channel.SimpleChannelInboundHandler;
+import org.apache.fluss.shaded.netty4.io.netty.handler.codec.http.DefaultFullHttpResponse;
+import org.apache.fluss.shaded.netty4.io.netty.handler.codec.http.FullHttpResponse;
+import org.apache.fluss.shaded.netty4.io.netty.handler.codec.http.HttpMethod;
+import org.apache.fluss.shaded.netty4.io.netty.handler.codec.http.HttpObject;
+import org.apache.fluss.shaded.netty4.io.netty.handler.codec.http.HttpRequest;
+import org.apache.fluss.shaded.netty4.io.netty.handler.codec.http.HttpResponseStatus;
+import org.apache.fluss.shaded.netty4.io.netty.util.AsciiString;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
-import static com.alibaba.fluss.shaded.guava32.com.google.common.net.HttpHeaders.CONTENT_ENCODING;
-import static com.alibaba.fluss.shaded.guava32.com.google.common.net.HttpHeaders.CONTENT_LENGTH;
-import static com.alibaba.fluss.shaded.netty4.io.netty.handler.codec.http.HttpHeaderNames.CONNECTION;
-import static com.alibaba.fluss.shaded.netty4.io.netty.handler.codec.http.HttpHeaderNames.CONTENT_TYPE;
-import static com.alibaba.fluss.shaded.netty4.io.netty.handler.codec.http.HttpHeaderValues.APPLICATION_JSON;
-import static com.alibaba.fluss.shaded.netty4.io.netty.handler.codec.http.HttpHeaderValues.CLOSE;
-import static com.alibaba.fluss.shaded.netty4.io.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND;
-import static com.alibaba.fluss.shaded.netty4.io.netty.handler.codec.http.HttpResponseStatus.OK;
+import static org.apache.fluss.shaded.guava32.com.google.common.net.HttpHeaders.CONTENT_ENCODING;
+import static org.apache.fluss.shaded.guava32.com.google.common.net.HttpHeaders.CONTENT_LENGTH;
+import static org.apache.fluss.shaded.netty4.io.netty.handler.codec.http.HttpHeaderNames.CONNECTION;
+import static org.apache.fluss.shaded.netty4.io.netty.handler.codec.http.HttpHeaderNames.CONTENT_TYPE;
+import static org.apache.fluss.shaded.netty4.io.netty.handler.codec.http.HttpHeaderValues.APPLICATION_JSON;
+import static org.apache.fluss.shaded.netty4.io.netty.handler.codec.http.HttpHeaderValues.CLOSE;
+import static org.apache.fluss.shaded.netty4.io.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND;
+import static org.apache.fluss.shaded.netty4.io.netty.handler.codec.http.HttpResponseStatus.OK;
/** Netty Handler for facilitating the Google auth token generation. */
public class AuthServerHandler extends SimpleChannelInboundHandler<HttpObject> {
diff --git a/fluss-filesystems/fluss-fs-gs/src/test/java/com/alibaba/fluss/fs/gs/MockAuthServer.java b/fluss-filesystems/fluss-fs-gs/src/test/java/com/alibaba/fluss/fs/gs/MockAuthServer.java
index 2086c894d..cd197d223 100644
--- a/fluss-filesystems/fluss-fs-gs/src/test/java/com/alibaba/fluss/fs/gs/MockAuthServer.java
+++ b/fluss-filesystems/fluss-fs-gs/src/test/java/com/alibaba/fluss/fs/gs/MockAuthServer.java
@@ -17,19 +17,19 @@
package com.alibaba.fluss.fs.gs;
-import com.alibaba.fluss.shaded.netty4.io.netty.bootstrap.ServerBootstrap;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelFuture;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelInitializer;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelOption;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelPipeline;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.EventLoopGroup;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.nio.NioEventLoopGroup;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.socket.SocketChannel;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.socket.nio.NioServerSocketChannel;
-import com.alibaba.fluss.shaded.netty4.io.netty.handler.codec.http.HttpServerCodec;
-import com.alibaba.fluss.shaded.netty4.io.netty.handler.codec.http.HttpServerExpectContinueHandler;
-import com.alibaba.fluss.shaded.netty4.io.netty.handler.logging.LogLevel;
-import com.alibaba.fluss.shaded.netty4.io.netty.handler.logging.LoggingHandler;
+import org.apache.fluss.shaded.netty4.io.netty.bootstrap.ServerBootstrap;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelFuture;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelInitializer;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelOption;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelPipeline;
+import org.apache.fluss.shaded.netty4.io.netty.channel.EventLoopGroup;
+import org.apache.fluss.shaded.netty4.io.netty.channel.nio.NioEventLoopGroup;
+import org.apache.fluss.shaded.netty4.io.netty.channel.socket.SocketChannel;
+import org.apache.fluss.shaded.netty4.io.netty.channel.socket.nio.NioServerSocketChannel;
+import org.apache.fluss.shaded.netty4.io.netty.handler.codec.http.HttpServerCodec;
+import org.apache.fluss.shaded.netty4.io.netty.handler.codec.http.HttpServerExpectContinueHandler;
+import org.apache.fluss.shaded.netty4.io.netty.handler.logging.LogLevel;
+import org.apache.fluss.shaded.netty4.io.netty.handler.logging.LoggingHandler;
import java.io.Closeable;
diff --git a/fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/source/deserializer/JsonStringDeserializationSchema.java b/fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/source/deserializer/JsonStringDeserializationSchema.java
index 143caa119..3ff9e0b50 100644
--- a/fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/source/deserializer/JsonStringDeserializationSchema.java
+++ b/fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/source/deserializer/JsonStringDeserializationSchema.java
@@ -21,14 +21,14 @@ import com.alibaba.fluss.annotation.PublicEvolving;
import com.alibaba.fluss.flink.utils.FlussRowToJsonConverters;
import com.alibaba.fluss.flink.utils.TimestampFormat;
import com.alibaba.fluss.record.LogRecord;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.SerializationFeature;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.node.ObjectNode;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import com.alibaba.fluss.types.RowType;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.api.common.typeinfo.Types;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.SerializationFeature;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import java.util.LinkedHashMap;
import java.util.Map;
diff --git a/fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/tiering/committer/TieringCommitOperator.java b/fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/tiering/committer/TieringCommitOperator.java
index 64d78d7c2..9ba32d0d6 100644
--- a/fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/tiering/committer/TieringCommitOperator.java
+++ b/fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/tiering/committer/TieringCommitOperator.java
@@ -36,8 +36,6 @@ import com.alibaba.fluss.metadata.ResolvedPartitionSpec;
import com.alibaba.fluss.metadata.TableBucket;
import com.alibaba.fluss.metadata.TableInfo;
import com.alibaba.fluss.metadata.TablePath;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonFactory;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
import com.alibaba.fluss.utils.ExceptionUtils;
import com.alibaba.fluss.utils.json.BucketOffsetJsonSerde;
@@ -47,6 +45,8 @@ import org.apache.flink.streaming.api.operators.AbstractStreamOperator;
import org.apache.flink.streaming.api.operators.OneInputStreamOperator;
import org.apache.flink.streaming.api.operators.StreamOperatorParameters;
import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonFactory;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
import javax.annotation.Nullable;
diff --git a/fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/tiering/source/TieringSource.java b/fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/tiering/source/TieringSource.java
index d16b597f1..53038c488 100644
--- a/fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/tiering/source/TieringSource.java
+++ b/fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/tiering/source/TieringSource.java
@@ -24,9 +24,6 @@ import com.alibaba.fluss.flink.tiering.source.split.TieringSplitSerializer;
import com.alibaba.fluss.flink.tiering.source.state.TieringSourceEnumeratorState;
import com.alibaba.fluss.flink.tiering.source.state.TieringSourceEnumeratorStateSerializer;
import com.alibaba.fluss.lake.writer.LakeTieringFactory;
-import com.alibaba.fluss.shaded.guava32.com.google.common.hash.HashFunction;
-import com.alibaba.fluss.shaded.guava32.com.google.common.hash.Hasher;
-import com.alibaba.fluss.shaded.guava32.com.google.common.hash.Hashing;
import org.apache.flink.api.connector.source.Boundedness;
import org.apache.flink.api.connector.source.Source;
@@ -37,6 +34,9 @@ import org.apache.flink.api.connector.source.SplitEnumeratorContext;
import org.apache.flink.core.io.SimpleVersionedSerializer;
import org.apache.flink.runtime.jobgraph.OperatorID;
import org.apache.flink.streaming.api.graph.StreamGraphHasherV2;
+import org.apache.fluss.shaded.guava32.com.google.common.hash.HashFunction;
+import org.apache.fluss.shaded.guava32.com.google.common.hash.Hasher;
+import org.apache.fluss.shaded.guava32.com.google.common.hash.Hashing;
import java.nio.charset.StandardCharsets;
diff --git a/fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/utils/FlussRowToJsonConverters.java b/fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/utils/FlussRowToJsonConverters.java
index 3350dd1a0..041433b6d 100644
--- a/fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/utils/FlussRowToJsonConverters.java
+++ b/fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/utils/FlussRowToJsonConverters.java
@@ -21,15 +21,16 @@ import com.alibaba.fluss.row.Decimal;
import com.alibaba.fluss.row.InternalRow;
import com.alibaba.fluss.row.TimestampLtz;
import com.alibaba.fluss.row.TimestampNtz;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.node.ObjectNode;
import com.alibaba.fluss.types.ArrayType;
import com.alibaba.fluss.types.DataField;
import com.alibaba.fluss.types.DataType;
import com.alibaba.fluss.types.MapType;
import com.alibaba.fluss.types.RowType;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.node.ObjectNode;
+
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
@@ -42,8 +43,8 @@ import static com.alibaba.fluss.flink.utils.TimeFormats.ISO8601_TIMESTAMP_WITH_L
import static com.alibaba.fluss.flink.utils.TimeFormats.SQL_TIMESTAMP_FORMAT;
import static com.alibaba.fluss.flink.utils.TimeFormats.SQL_TIMESTAMP_WITH_LOCAL_TIMEZONE_FORMAT;
import static com.alibaba.fluss.flink.utils.TimeFormats.SQL_TIME_FORMAT;
-import static com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN;
import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE;
+import static org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN;
/** A converter to convert Fluss's {@link com.alibaba.fluss.row.InternalRow} to {@link JsonNode}. */
public class FlussRowToJsonConverters {
diff --git a/fluss-jmh/src/test/java/com/alibaba/fluss/jmh/ArrowReadableChannelBenchmark.java b/fluss-jmh/src/test/java/com/alibaba/fluss/jmh/ArrowReadableChannelBenchmark.java
index 05f3ee3d3..5a167a7e0 100644
--- a/fluss-jmh/src/test/java/com/alibaba/fluss/jmh/ArrowReadableChannelBenchmark.java
+++ b/fluss-jmh/src/test/java/com/alibaba/fluss/jmh/ArrowReadableChannelBenchmark.java
@@ -17,26 +17,26 @@
package com.alibaba.fluss.jmh;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.IntVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.LargeVarBinaryVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VectorLoader;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VectorUnloader;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.ReadChannel;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.WriteChannel;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.IpcOption;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.MessageSerializer;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.ArrowType;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Field;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.FieldType;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Schema;
-import com.alibaba.fluss.shaded.zookeeper3.org.apache.zookeeper.server.ByteBufferInputStream;
import com.alibaba.fluss.utils.ByteBufferReadableChannel;
import org.apache.commons.lang3.RandomUtils;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.IntVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.LargeVarBinaryVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VectorLoader;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VectorUnloader;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.ReadChannel;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.WriteChannel;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.IpcOption;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.MessageSerializer;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.ArrowType;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Field;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.FieldType;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Schema;
+import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.server.ByteBufferInputStream;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.Fork;
import org.openjdk.jmh.annotations.Level;
diff --git a/fluss-jmh/src/test/java/com/alibaba/fluss/jmh/ArrowWritableChannelBenchmark.java b/fluss-jmh/src/test/java/com/alibaba/fluss/jmh/ArrowWritableChannelBenchmark.java
index 5bc6e4c48..3958fa20f 100644
--- a/fluss-jmh/src/test/java/com/alibaba/fluss/jmh/ArrowWritableChannelBenchmark.java
+++ b/fluss-jmh/src/test/java/com/alibaba/fluss/jmh/ArrowWritableChannelBenchmark.java
@@ -18,23 +18,23 @@
package com.alibaba.fluss.jmh;
import com.alibaba.fluss.memory.MemorySegment;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.IntVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.LargeVarBinaryVector;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.VectorUnloader;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.WriteChannel;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.IpcOption;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.MessageSerializer;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.ArrowType;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Field;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.FieldType;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Schema;
import com.alibaba.fluss.utils.MemorySegmentWritableChannel;
import org.apache.commons.lang3.RandomUtils;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.IntVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.LargeVarBinaryVector;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VectorSchemaRoot;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.VectorUnloader;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.WriteChannel;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.IpcOption;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.MessageSerializer;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.ArrowType;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Field;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.FieldType;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Schema;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.Fork;
import org.openjdk.jmh.annotations.Level;
diff --git a/fluss-kafka/pom.xml b/fluss-kafka/pom.xml
index a221d041b..de8894d31 100644
--- a/fluss-kafka/pom.xml
+++ b/fluss-kafka/pom.xml
@@ -41,7 +41,7 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.fluss</groupId>
<artifactId>fluss-shaded-netty</artifactId>
</dependency>
diff --git a/fluss-kafka/src/main/java/com/alibaba/fluss/kafka/KafkaChannelInitializer.java b/fluss-kafka/src/main/java/com/alibaba/fluss/kafka/KafkaChannelInitializer.java
index 33813bb2b..34e986690 100644
--- a/fluss-kafka/src/main/java/com/alibaba/fluss/kafka/KafkaChannelInitializer.java
+++ b/fluss-kafka/src/main/java/com/alibaba/fluss/kafka/KafkaChannelInitializer.java
@@ -19,10 +19,11 @@ package com.alibaba.fluss.kafka;
import com.alibaba.fluss.rpc.netty.NettyChannelInitializer;
import com.alibaba.fluss.rpc.netty.server.RequestChannel;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelInitializer;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.socket.SocketChannel;
-import com.alibaba.fluss.shaded.netty4.io.netty.handler.codec.LengthFieldPrepender;
-import com.alibaba.fluss.shaded.netty4.io.netty.handler.flow.FlowControlHandler;
+
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelInitializer;
+import org.apache.fluss.shaded.netty4.io.netty.channel.socket.SocketChannel;
+import org.apache.fluss.shaded.netty4.io.netty.handler.codec.LengthFieldPrepender;
+import org.apache.fluss.shaded.netty4.io.netty.handler.flow.FlowControlHandler;
/**
* A {@link ChannelInitializer} for initializing {@link SocketChannel} instances that will be used
diff --git a/fluss-kafka/src/main/java/com/alibaba/fluss/kafka/KafkaCommandDecoder.java b/fluss-kafka/src/main/java/com/alibaba/fluss/kafka/KafkaCommandDecoder.java
index 78e2fdd17..c0d892595 100644
--- a/fluss-kafka/src/main/java/com/alibaba/fluss/kafka/KafkaCommandDecoder.java
+++ b/fluss-kafka/src/main/java/com/alibaba/fluss/kafka/KafkaCommandDecoder.java
@@ -18,14 +18,14 @@
package com.alibaba.fluss.kafka;
import com.alibaba.fluss.rpc.netty.server.RequestChannel;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.SimpleChannelInboundHandler;
-import com.alibaba.fluss.shaded.netty4.io.netty.handler.timeout.IdleState;
-import com.alibaba.fluss.shaded.netty4.io.netty.handler.timeout.IdleStateEvent;
-import com.alibaba.fluss.shaded.netty4.io.netty.util.ReferenceCountUtil;
import com.alibaba.fluss.utils.MathUtils;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
+import org.apache.fluss.shaded.netty4.io.netty.channel.SimpleChannelInboundHandler;
+import org.apache.fluss.shaded.netty4.io.netty.handler.timeout.IdleState;
+import org.apache.fluss.shaded.netty4.io.netty.handler.timeout.IdleStateEvent;
+import org.apache.fluss.shaded.netty4.io.netty.util.ReferenceCountUtil;
import org.apache.kafka.common.errors.LeaderNotAvailableException;
import org.apache.kafka.common.protocol.ApiKeys;
import org.apache.kafka.common.requests.AbstractRequest;
diff --git a/fluss-kafka/src/main/java/com/alibaba/fluss/kafka/KafkaProtocolPlugin.java b/fluss-kafka/src/main/java/com/alibaba/fluss/kafka/KafkaProtocolPlugin.java
index 552f8e012..861bb5ce0 100644
--- a/fluss-kafka/src/main/java/com/alibaba/fluss/kafka/KafkaProtocolPlugin.java
+++ b/fluss-kafka/src/main/java/com/alibaba/fluss/kafka/KafkaProtocolPlugin.java
@@ -24,7 +24,8 @@ import com.alibaba.fluss.rpc.gateway.TabletServerGateway;
import com.alibaba.fluss.rpc.netty.server.RequestChannel;
import com.alibaba.fluss.rpc.netty.server.RequestHandler;
import com.alibaba.fluss.rpc.protocol.NetworkProtocolPlugin;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelHandler;
+
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandler;
import java.util.List;
diff --git a/fluss-kafka/src/main/java/com/alibaba/fluss/kafka/KafkaRequest.java b/fluss-kafka/src/main/java/com/alibaba/fluss/kafka/KafkaRequest.java
index 1045a5080..449969926 100644
--- a/fluss-kafka/src/main/java/com/alibaba/fluss/kafka/KafkaRequest.java
+++ b/fluss-kafka/src/main/java/com/alibaba/fluss/kafka/KafkaRequest.java
@@ -19,10 +19,10 @@ package com.alibaba.fluss.kafka;
import com.alibaba.fluss.rpc.netty.server.RpcRequest;
import com.alibaba.fluss.rpc.protocol.RequestType;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
-import com.alibaba.fluss.shaded.netty4.io.netty.util.ReferenceCountUtil;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
+import org.apache.fluss.shaded.netty4.io.netty.util.ReferenceCountUtil;
import org.apache.kafka.common.protocol.ApiKeys;
import org.apache.kafka.common.protocol.ApiMessage;
import org.apache.kafka.common.protocol.ByteBufferAccessor;
diff --git a/fluss-kafka/src/test/java/com/alibaba/fluss/kafka/KafkaRequestHandlerTest.java b/fluss-kafka/src/test/java/com/alibaba/fluss/kafka/KafkaRequestHandlerTest.java
index cbf6531e4..13a59c263 100644
--- a/fluss-kafka/src/test/java/com/alibaba/fluss/kafka/KafkaRequestHandlerTest.java
+++ b/fluss-kafka/src/test/java/com/alibaba/fluss/kafka/KafkaRequestHandlerTest.java
@@ -18,10 +18,10 @@
package com.alibaba.fluss.kafka;
import com.alibaba.fluss.rpc.TestingTabletGatewayService;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBufAllocator;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBufAllocator;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
import org.apache.kafka.common.protocol.ApiKeys;
import org.apache.kafka.common.protocol.Errors;
import org.apache.kafka.common.requests.AbstractResponse;
diff --git a/fluss-kafka/src/test/java/com/alibaba/fluss/kafka/TestingChannelHandlerContext.java b/fluss-kafka/src/test/java/com/alibaba/fluss/kafka/TestingChannelHandlerContext.java
index 26f30bae1..d9628c79c 100644
--- a/fluss-kafka/src/test/java/com/alibaba/fluss/kafka/TestingChannelHandlerContext.java
+++ b/fluss-kafka/src/test/java/com/alibaba/fluss/kafka/TestingChannelHandlerContext.java
@@ -17,17 +17,17 @@
package com.alibaba.fluss.kafka;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBufAllocator;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.Channel;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelFuture;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelHandler;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelPipeline;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelProgressivePromise;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelPromise;
-import com.alibaba.fluss.shaded.netty4.io.netty.util.Attribute;
-import com.alibaba.fluss.shaded.netty4.io.netty.util.AttributeKey;
-import com.alibaba.fluss.shaded.netty4.io.netty.util.concurrent.EventExecutor;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBufAllocator;
+import org.apache.fluss.shaded.netty4.io.netty.channel.Channel;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelFuture;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandler;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelPipeline;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelProgressivePromise;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelPromise;
+import org.apache.fluss.shaded.netty4.io.netty.util.Attribute;
+import org.apache.fluss.shaded.netty4.io.netty.util.AttributeKey;
+import org.apache.fluss.shaded.netty4.io.netty.util.concurrent.EventExecutor;
import java.net.SocketAddress;
diff --git a/fluss-lake/fluss-lake-iceberg/src/main/java/com/alibaba/fluss/lake/iceberg/tiering/IcebergLakeCommitter.java b/fluss-lake/fluss-lake-iceberg/src/main/java/com/alibaba/fluss/lake/iceberg/tiering/IcebergLakeCommitter.java
index d3009ee0e..376589d3a 100644
--- a/fluss-lake/fluss-lake-iceberg/src/main/java/com/alibaba/fluss/lake/iceberg/tiering/IcebergLakeCommitter.java
+++ b/fluss-lake/fluss-lake-iceberg/src/main/java/com/alibaba/fluss/lake/iceberg/tiering/IcebergLakeCommitter.java
@@ -21,10 +21,10 @@ import com.alibaba.fluss.lake.committer.BucketOffset;
import com.alibaba.fluss.lake.committer.CommittedLakeSnapshot;
import com.alibaba.fluss.lake.committer.LakeCommitter;
import com.alibaba.fluss.metadata.TablePath;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
import com.alibaba.fluss.utils.json.BucketOffsetJsonSerde;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.iceberg.AppendFiles;
import org.apache.iceberg.CatalogUtil;
import org.apache.iceberg.DataFile;
diff --git a/fluss-lake/fluss-lake-paimon/src/main/java/com/alibaba/fluss/lake/paimon/tiering/PaimonLakeCommitter.java b/fluss-lake/fluss-lake-paimon/src/main/java/com/alibaba/fluss/lake/paimon/tiering/PaimonLakeCommitter.java
index 5fbe54c7e..9b4c1fb5f 100644
--- a/fluss-lake/fluss-lake-paimon/src/main/java/com/alibaba/fluss/lake/paimon/tiering/PaimonLakeCommitter.java
+++ b/fluss-lake/fluss-lake-paimon/src/main/java/com/alibaba/fluss/lake/paimon/tiering/PaimonLakeCommitter.java
@@ -21,10 +21,10 @@ import com.alibaba.fluss.lake.committer.BucketOffset;
import com.alibaba.fluss.lake.committer.CommittedLakeSnapshot;
import com.alibaba.fluss.lake.committer.LakeCommitter;
import com.alibaba.fluss.metadata.TablePath;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
import com.alibaba.fluss.utils.json.BucketOffsetJsonSerde;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.paimon.CoreOptions;
import org.apache.paimon.Snapshot;
import org.apache.paimon.catalog.Catalog;
diff --git a/fluss-metrics/fluss-metrics-prometheus/src/test/java/com/alibaba/fluss/metrics/prometheus/PrometheusReporterTest.java b/fluss-metrics/fluss-metrics-prometheus/src/test/java/com/alibaba/fluss/metrics/prometheus/PrometheusReporterTest.java
index 344aa0519..5884552c6 100644
--- a/fluss-metrics/fluss-metrics-prometheus/src/test/java/com/alibaba/fluss/metrics/prometheus/PrometheusReporterTest.java
+++ b/fluss-metrics/fluss-metrics-prometheus/src/test/java/com/alibaba/fluss/metrics/prometheus/PrometheusReporterTest.java
@@ -26,12 +26,12 @@ import com.alibaba.fluss.metrics.SimpleCounter;
import com.alibaba.fluss.metrics.groups.MetricGroup;
import com.alibaba.fluss.metrics.util.TestHistogram;
import com.alibaba.fluss.metrics.util.TestMeter;
-import com.alibaba.fluss.shaded.guava32.com.google.common.collect.Iterators;
import com.alibaba.fluss.utils.NetUtils;
import com.mashape.unirest.http.HttpResponse;
import com.mashape.unirest.http.Unirest;
import com.mashape.unirest.http.exceptions.UnirestException;
+import org.apache.fluss.shaded.guava32.com.google.common.collect.Iterators;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-protogen/fluss-protogen-generator/pom.xml b/fluss-protogen/fluss-protogen-generator/pom.xml
index d6c1f224c..3e8c5502c 100644
--- a/fluss-protogen/fluss-protogen-generator/pom.xml
+++ b/fluss-protogen/fluss-protogen-generator/pom.xml
@@ -44,7 +44,7 @@
</dependency>
<dependency>
- <groupId>com.alibaba.fluss</groupId>
+ <groupId>org.apache.fluss</groupId>
<artifactId>fluss-shaded-guava</artifactId>
</dependency>
diff --git a/fluss-protogen/fluss-protogen-generator/src/main/java/com/alibaba/fluss/protogen/generator/generator/ProtoCodeGenerator.java b/fluss-protogen/fluss-protogen-generator/src/main/java/com/alibaba/fluss/protogen/generator/generator/ProtoCodeGenerator.java
index b303c24c5..367c3e692 100644
--- a/fluss-protogen/fluss-protogen-generator/src/main/java/com/alibaba/fluss/protogen/generator/generator/ProtoCodeGenerator.java
+++ b/fluss-protogen/fluss-protogen-generator/src/main/java/com/alibaba/fluss/protogen/generator/generator/ProtoCodeGenerator.java
@@ -17,11 +17,10 @@
package com.alibaba.fluss.protogen.generator.generator;
-import com.alibaba.fluss.shaded.guava32.com.google.common.base.Joiner;
-import com.alibaba.fluss.shaded.guava32.com.google.common.base.Splitter;
-
import io.protostuff.parser.Proto;
import io.protostuff.parser.ProtoUtil;
+import org.apache.fluss.shaded.guava32.com.google.common.base.Joiner;
+import org.apache.fluss.shaded.guava32.com.google.common.base.Splitter;
import java.io.File;
import java.nio.file.Path;
diff --git a/fluss-protogen/fluss-protogen-generator/src/main/java/com/alibaba/fluss/protogen/generator/generator/ProtoGenUtil.java b/fluss-protogen/fluss-protogen-generator/src/main/java/com/alibaba/fluss/protogen/generator/generator/ProtoGenUtil.java
index e5519199c..c2e172445 100644
--- a/fluss-protogen/fluss-protogen-generator/src/main/java/com/alibaba/fluss/protogen/generator/generator/ProtoGenUtil.java
+++ b/fluss-protogen/fluss-protogen-generator/src/main/java/com/alibaba/fluss/protogen/generator/generator/ProtoGenUtil.java
@@ -25,14 +25,15 @@ import com.alibaba.fluss.record.send.ByteBufWritableOutput;
import com.alibaba.fluss.record.send.WritableOutput;
import com.alibaba.fluss.rpc.messages.ApiMessage;
import com.alibaba.fluss.rpc.messages.ErrorMessage;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.Unpooled;
import com.alibaba.fluss.utils.ProtoCodecUtils;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled;
+
import java.io.PrintWriter;
-import static com.alibaba.fluss.shaded.guava32.com.google.common.base.CaseFormat.LOWER_CAMEL;
-import static com.alibaba.fluss.shaded.guava32.com.google.common.base.CaseFormat.LOWER_UNDERSCORE;
+import static org.apache.fluss.shaded.guava32.com.google.common.base.CaseFormat.LOWER_CAMEL;
+import static org.apache.fluss.shaded.guava32.com.google.common.base.CaseFormat.LOWER_UNDERSCORE;
/** Utility class for String manipulation. */
public class ProtoGenUtil {
diff --git a/fluss-protogen/fluss-protogen-generator/src/main/java/com/alibaba/fluss/protogen/generator/generator/ProtobufNumberField.java b/fluss-protogen/fluss-protogen-generator/src/main/java/com/alibaba/fluss/protogen/generator/generator/ProtobufNumberField.java
index d0e37eb27..03cc6ed09 100644
--- a/fluss-protogen/fluss-protogen-generator/src/main/java/com/alibaba/fluss/protogen/generator/generator/ProtobufNumberField.java
+++ b/fluss-protogen/fluss-protogen-generator/src/main/java/com/alibaba/fluss/protogen/generator/generator/ProtobufNumberField.java
@@ -17,9 +17,8 @@
package com.alibaba.fluss.protogen.generator.generator;
-import com.alibaba.fluss.shaded.guava32.com.google.common.collect.Maps;
-
import io.protostuff.parser.Field;
+import org.apache.fluss.shaded.guava32.com.google.common.collect.Maps;
import java.io.PrintWriter;
import java.util.Map;
diff --git a/fluss-protogen/fluss-protogen-tests/src/main/java/com/alibaba/fluss/protogen/benchmark/ProtoBenchmark.java b/fluss-protogen/fluss-protogen-tests/src/main/java/com/alibaba/fluss/protogen/benchmark/ProtoBenchmark.java
index 5803efb09..d85814a08 100644
--- a/fluss-protogen/fluss-protogen-tests/src/main/java/com/alibaba/fluss/protogen/benchmark/ProtoBenchmark.java
+++ b/fluss-protogen/fluss-protogen-tests/src/main/java/com/alibaba/fluss/protogen/benchmark/ProtoBenchmark.java
@@ -20,11 +20,11 @@ package com.alibaba.fluss.protogen.benchmark;
import com.alibaba.fluss.protogen.tests.AddressBook;
import com.alibaba.fluss.protogen.tests.AddressBookProtos;
import com.alibaba.fluss.protogen.tests.Person;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.PooledByteBufAllocator;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.Unpooled;
import com.google.protobuf.CodedOutputStream;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.PooledByteBufAllocator;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.Fork;
import org.openjdk.jmh.annotations.Measurement;
diff --git a/fluss-protogen/fluss-protogen-tests/src/main/java/com/alibaba/fluss/protogen/benchmark/SimpleBenchmark.java b/fluss-protogen/fluss-protogen-tests/src/main/java/com/alibaba/fluss/protogen/benchmark/SimpleBenchmark.java
index 511114837..b8a41993a 100644
--- a/fluss-protogen/fluss-protogen-tests/src/main/java/com/alibaba/fluss/protogen/benchmark/SimpleBenchmark.java
+++ b/fluss-protogen/fluss-protogen-tests/src/main/java/com/alibaba/fluss/protogen/benchmark/SimpleBenchmark.java
@@ -20,11 +20,11 @@ package com.alibaba.fluss.protogen.benchmark;
import com.alibaba.fluss.protogen.tests.Frame;
import com.alibaba.fluss.protogen.tests.Point;
import com.alibaba.fluss.protogen.tests.PointFrame;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.PooledByteBufAllocator;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.Unpooled;
import com.google.protobuf.CodedOutputStream;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.PooledByteBufAllocator;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.Fork;
import org.openjdk.jmh.annotations.Measurement;
diff --git a/fluss-protogen/fluss-protogen-tests/src/main/java/com/alibaba/fluss/protogen/benchmark/StringEncodingBenchmark.java b/fluss-protogen/fluss-protogen-tests/src/main/java/com/alibaba/fluss/protogen/benchmark/StringEncodingBenchmark.java
index c774c20ed..03d15fd38 100644
--- a/fluss-protogen/fluss-protogen-tests/src/main/java/com/alibaba/fluss/protogen/benchmark/StringEncodingBenchmark.java
+++ b/fluss-protogen/fluss-protogen-tests/src/main/java/com/alibaba/fluss/protogen/benchmark/StringEncodingBenchmark.java
@@ -17,10 +17,9 @@
package com.alibaba.fluss.protogen.benchmark;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBufAllocator;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBufUtil;
-
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBufAllocator;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBufUtil;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.Fork;
import org.openjdk.jmh.annotations.Measurement;
diff --git a/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/AddressBookTest.java b/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/AddressBookTest.java
index bfc8c9fd3..738ce986c 100644
--- a/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/AddressBookTest.java
+++ b/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/AddressBookTest.java
@@ -17,10 +17,9 @@
package com.alibaba.fluss.protogen.tests;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.Unpooled;
-
import com.google.protobuf.CodedOutputStream;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/BytesTest.java b/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/BytesTest.java
index cfc7d9994..a02ab28a0 100644
--- a/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/BytesTest.java
+++ b/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/BytesTest.java
@@ -21,11 +21,11 @@ import com.alibaba.fluss.memory.MemorySegment;
import com.alibaba.fluss.record.bytesview.MultiBytesView;
import com.alibaba.fluss.record.send.Send;
import com.alibaba.fluss.record.send.SendWritableOutput;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.Unpooled;
import com.google.protobuf.ByteString;
import com.google.protobuf.CodedOutputStream;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
diff --git a/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/EnumsTest.java b/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/EnumsTest.java
index 49649ce0d..75ad1d5d7 100644
--- a/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/EnumsTest.java
+++ b/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/EnumsTest.java
@@ -17,10 +17,9 @@
package com.alibaba.fluss.protogen.tests;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.Unpooled;
-
import com.google.protobuf.CodedOutputStream;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/MessagesTest.java b/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/MessagesTest.java
index 730759f48..a95452a89 100644
--- a/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/MessagesTest.java
+++ b/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/MessagesTest.java
@@ -19,10 +19,10 @@ package com.alibaba.fluss.protogen.tests;
import com.alibaba.fluss.rpc.messages.ApiMessage;
import com.alibaba.fluss.rpc.messages.ErrorMessage;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.Unpooled;
import com.google.protobuf.CodedOutputStream;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/NumbersTest.java b/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/NumbersTest.java
index dd53a9544..f93221a66 100644
--- a/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/NumbersTest.java
+++ b/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/NumbersTest.java
@@ -17,10 +17,9 @@
package com.alibaba.fluss.protogen.tests;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.Unpooled;
-
import com.google.protobuf.CodedOutputStream;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/RepeatedNumbersTest.java b/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/RepeatedNumbersTest.java
index e02ed1ea1..925397be4 100644
--- a/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/RepeatedNumbersTest.java
+++ b/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/RepeatedNumbersTest.java
@@ -17,10 +17,9 @@
package com.alibaba.fluss.protogen.tests;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.Unpooled;
-
import com.google.protobuf.CodedOutputStream;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/RequiredTest.java b/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/RequiredTest.java
index 45c591f7a..67bf3e751 100644
--- a/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/RequiredTest.java
+++ b/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/RequiredTest.java
@@ -17,10 +17,9 @@
package com.alibaba.fluss.protogen.tests;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.Unpooled;
-
import com.google.protobuf.CodedOutputStream;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/StringsTest.java b/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/StringsTest.java
index 78fd81655..ac54bc926 100644
--- a/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/StringsTest.java
+++ b/fluss-protogen/fluss-protogen-tests/src/test/java/com/alibaba/fluss/protogen/tests/StringsTest.java
@@ -17,10 +17,9 @@
package com.alibaba.fluss.protogen.tests;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.Unpooled;
-
import com.google.protobuf.CodedOutputStream;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/RpcGateway.java b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/RpcGateway.java
index e17b559cb..949855381 100644
--- a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/RpcGateway.java
+++ b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/RpcGateway.java
@@ -23,7 +23,8 @@ import com.alibaba.fluss.rpc.messages.AuthenticateRequest;
import com.alibaba.fluss.rpc.messages.AuthenticateResponse;
import com.alibaba.fluss.rpc.protocol.ApiKeys;
import com.alibaba.fluss.rpc.protocol.RPC;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
+
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
import java.util.concurrent.CompletableFuture;
diff --git a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/NettyChannelInitializer.java b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/NettyChannelInitializer.java
index e562f1888..f38ce178f 100644
--- a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/NettyChannelInitializer.java
+++ b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/NettyChannelInitializer.java
@@ -17,10 +17,10 @@
package com.alibaba.fluss.rpc.netty;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelInitializer;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.socket.SocketChannel;
-import com.alibaba.fluss.shaded.netty4.io.netty.handler.codec.LengthFieldBasedFrameDecoder;
-import com.alibaba.fluss.shaded.netty4.io.netty.handler.timeout.IdleStateHandler;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelInitializer;
+import org.apache.fluss.shaded.netty4.io.netty.channel.socket.SocketChannel;
+import org.apache.fluss.shaded.netty4.io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+import org.apache.fluss.shaded.netty4.io.netty.handler.timeout.IdleStateHandler;
import static com.alibaba.fluss.utils.Preconditions.checkArgument;
diff --git a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/NettyLogger.java b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/NettyLogger.java
index cb54a64a4..d7cd71e07 100644
--- a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/NettyLogger.java
+++ b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/NettyLogger.java
@@ -17,12 +17,11 @@
package com.alibaba.fluss.rpc.netty;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBufHolder;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
-import com.alibaba.fluss.shaded.netty4.io.netty.handler.logging.LogLevel;
-import com.alibaba.fluss.shaded.netty4.io.netty.handler.logging.LoggingHandler;
-
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBufHolder;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
+import org.apache.fluss.shaded.netty4.io.netty.handler.logging.LogLevel;
+import org.apache.fluss.shaded.netty4.io.netty.handler.logging.LoggingHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/NettyMetrics.java b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/NettyMetrics.java
index 3647d92c1..d3f910cf7 100644
--- a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/NettyMetrics.java
+++ b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/NettyMetrics.java
@@ -21,9 +21,10 @@ import com.alibaba.fluss.metrics.Gauge;
import com.alibaba.fluss.metrics.MeterView;
import com.alibaba.fluss.metrics.MetricNames;
import com.alibaba.fluss.metrics.groups.MetricGroup;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.PoolArenaMetric;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.PooledByteBufAllocator;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.PooledByteBufAllocatorMetric;
+
+import org.apache.fluss.shaded.netty4.io.netty.buffer.PoolArenaMetric;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.PooledByteBufAllocator;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.PooledByteBufAllocatorMetric;
/** A netty metrics class to register metrics from netty. */
public class NettyMetrics {
diff --git a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/NettyUtils.java b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/NettyUtils.java
index f9739dda6..9ebfa186e 100644
--- a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/NettyUtils.java
+++ b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/NettyUtils.java
@@ -17,19 +17,19 @@
package com.alibaba.fluss.rpc.netty;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.Channel;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.EventLoopGroup;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.epoll.Epoll;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.epoll.EpollEventLoopGroup;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.epoll.EpollServerSocketChannel;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.epoll.EpollSocketChannel;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.nio.NioEventLoopGroup;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.socket.ServerSocketChannel;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.socket.SocketChannel;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.socket.nio.NioServerSocketChannel;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.socket.nio.NioSocketChannel;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.unix.Errors;
-import com.alibaba.fluss.shaded.netty4.io.netty.util.concurrent.DefaultThreadFactory;
+import org.apache.fluss.shaded.netty4.io.netty.channel.Channel;
+import org.apache.fluss.shaded.netty4.io.netty.channel.EventLoopGroup;
+import org.apache.fluss.shaded.netty4.io.netty.channel.epoll.Epoll;
+import org.apache.fluss.shaded.netty4.io.netty.channel.epoll.EpollEventLoopGroup;
+import org.apache.fluss.shaded.netty4.io.netty.channel.epoll.EpollServerSocketChannel;
+import org.apache.fluss.shaded.netty4.io.netty.channel.epoll.EpollSocketChannel;
+import org.apache.fluss.shaded.netty4.io.netty.channel.nio.NioEventLoopGroup;
+import org.apache.fluss.shaded.netty4.io.netty.channel.socket.ServerSocketChannel;
+import org.apache.fluss.shaded.netty4.io.netty.channel.socket.SocketChannel;
+import org.apache.fluss.shaded.netty4.io.netty.channel.socket.nio.NioServerSocketChannel;
+import org.apache.fluss.shaded.netty4.io.netty.channel.socket.nio.NioSocketChannel;
+import org.apache.fluss.shaded.netty4.io.netty.channel.unix.Errors;
+import org.apache.fluss.shaded.netty4.io.netty.util.concurrent.DefaultThreadFactory;
import java.util.concurrent.CompletableFuture;
diff --git a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/client/ClientChannelInitializer.java b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/client/ClientChannelInitializer.java
index c0570ea2c..2e590a04f 100644
--- a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/client/ClientChannelInitializer.java
+++ b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/client/ClientChannelInitializer.java
@@ -18,8 +18,9 @@
package com.alibaba.fluss.rpc.netty.client;
import com.alibaba.fluss.rpc.netty.NettyChannelInitializer;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelInitializer;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.socket.SocketChannel;
+
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelInitializer;
+import org.apache.fluss.shaded.netty4.io.netty.channel.socket.SocketChannel;
/**
* A specialized {@link ChannelInitializer} for initializing {@link SocketChannel} instances that
diff --git a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/client/NettyClient.java b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/client/NettyClient.java
index ae9052ee4..9bc418149 100644
--- a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/client/NettyClient.java
+++ b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/client/NettyClient.java
@@ -29,13 +29,13 @@ import com.alibaba.fluss.rpc.netty.NettyUtils;
import com.alibaba.fluss.rpc.protocol.ApiKeys;
import com.alibaba.fluss.security.auth.AuthenticationFactory;
import com.alibaba.fluss.security.auth.ClientAuthenticator;
-import com.alibaba.fluss.shaded.netty4.io.netty.bootstrap.Bootstrap;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.PooledByteBufAllocator;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelOption;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.EventLoopGroup;
import com.alibaba.fluss.utils.MapUtils;
import com.alibaba.fluss.utils.concurrent.FutureUtils;
+import org.apache.fluss.shaded.netty4.io.netty.bootstrap.Bootstrap;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.PooledByteBufAllocator;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelOption;
+import org.apache.fluss.shaded.netty4.io.netty.channel.EventLoopGroup;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/client/NettyClientHandler.java b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/client/NettyClientHandler.java
index 844c68cff..53f61202f 100644
--- a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/client/NettyClientHandler.java
+++ b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/client/NettyClientHandler.java
@@ -24,13 +24,13 @@ import com.alibaba.fluss.rpc.messages.FetchLogResponse;
import com.alibaba.fluss.rpc.protocol.ApiError;
import com.alibaba.fluss.rpc.protocol.ApiMethod;
import com.alibaba.fluss.rpc.protocol.ResponseType;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.Unpooled;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelInboundHandlerAdapter;
-import com.alibaba.fluss.shaded.netty4.io.netty.handler.timeout.IdleState;
-import com.alibaba.fluss.shaded.netty4.io.netty.handler.timeout.IdleStateEvent;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelInboundHandlerAdapter;
+import org.apache.fluss.shaded.netty4.io.netty.handler.timeout.IdleState;
+import org.apache.fluss.shaded.netty4.io.netty.handler.timeout.IdleStateEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/client/ServerConnection.java b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/client/ServerConnection.java
index 88d97e5c8..0cef4b033 100644
--- a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/client/ServerConnection.java
+++ b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/client/ServerConnection.java
@@ -34,15 +34,15 @@ import com.alibaba.fluss.rpc.protocol.ApiManager;
import com.alibaba.fluss.rpc.protocol.ApiMethod;
import com.alibaba.fluss.rpc.protocol.MessageCodec;
import com.alibaba.fluss.security.auth.ClientAuthenticator;
-import com.alibaba.fluss.shaded.netty4.io.netty.bootstrap.Bootstrap;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBufAllocator;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.Channel;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelFuture;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelFutureListener;
import com.alibaba.fluss.utils.ExponentialBackoff;
import com.alibaba.fluss.utils.MapUtils;
+import org.apache.fluss.shaded.netty4.io.netty.bootstrap.Bootstrap;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBufAllocator;
+import org.apache.fluss.shaded.netty4.io.netty.channel.Channel;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelFuture;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelFutureListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/server/FlussProtocolPlugin.java b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/server/FlussProtocolPlugin.java
index 54ca1b72b..1c99fb0d6 100644
--- a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/server/FlussProtocolPlugin.java
+++ b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/server/FlussProtocolPlugin.java
@@ -26,7 +26,8 @@ import com.alibaba.fluss.rpc.protocol.ApiManager;
import com.alibaba.fluss.rpc.protocol.NetworkProtocolPlugin;
import com.alibaba.fluss.security.auth.AuthenticationFactory;
import com.alibaba.fluss.security.auth.PlainTextAuthenticationPlugin;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelHandler;
+
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandler;
import java.util.List;
import java.util.Optional;
diff --git a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/server/FlussRequest.java b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/server/FlussRequest.java
index aa4d02d5e..ac4eef287 100644
--- a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/server/FlussRequest.java
+++ b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/server/FlussRequest.java
@@ -21,9 +21,9 @@ import com.alibaba.fluss.rpc.messages.ApiMessage;
import com.alibaba.fluss.rpc.protocol.ApiMethod;
import com.alibaba.fluss.rpc.protocol.RequestType;
import com.alibaba.fluss.security.acl.FlussPrincipal;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.util.ReferenceCountUtil;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.util.ReferenceCountUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/server/NettyServer.java b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/server/NettyServer.java
index 9e641239e..d707ee886 100644
--- a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/server/NettyServer.java
+++ b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/server/NettyServer.java
@@ -28,15 +28,15 @@ import com.alibaba.fluss.rpc.RpcServer;
import com.alibaba.fluss.rpc.netty.NettyMetrics;
import com.alibaba.fluss.rpc.netty.NettyUtils;
import com.alibaba.fluss.rpc.protocol.NetworkProtocolPlugin;
-import com.alibaba.fluss.shaded.netty4.io.netty.bootstrap.ServerBootstrap;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.PooledByteBufAllocator;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.AdaptiveRecvByteBufAllocator;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.Channel;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelHandler;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelOption;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.EventLoopGroup;
import com.alibaba.fluss.utils.concurrent.FutureUtils;
+import org.apache.fluss.shaded.netty4.io.netty.bootstrap.ServerBootstrap;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.PooledByteBufAllocator;
+import org.apache.fluss.shaded.netty4.io.netty.channel.AdaptiveRecvByteBufAllocator;
+import org.apache.fluss.shaded.netty4.io.netty.channel.Channel;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandler;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelOption;
+import org.apache.fluss.shaded.netty4.io.netty.channel.EventLoopGroup;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/server/NettyServerHandler.java b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/server/NettyServerHandler.java
index c637fbd4f..73435c4ce 100644
--- a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/server/NettyServerHandler.java
+++ b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/server/NettyServerHandler.java
@@ -32,16 +32,16 @@ import com.alibaba.fluss.rpc.protocol.ApiManager;
import com.alibaba.fluss.rpc.protocol.ApiMethod;
import com.alibaba.fluss.rpc.protocol.MessageCodec;
import com.alibaba.fluss.security.auth.ServerAuthenticator;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBufAllocator;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelFutureListener;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelInboundHandlerAdapter;
-import com.alibaba.fluss.shaded.netty4.io.netty.handler.timeout.IdleState;
-import com.alibaba.fluss.shaded.netty4.io.netty.handler.timeout.IdleStateEvent;
import com.alibaba.fluss.utils.ExceptionUtils;
import com.alibaba.fluss.utils.IOUtils;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBufAllocator;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelFutureListener;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelInboundHandlerAdapter;
+import org.apache.fluss.shaded.netty4.io.netty.handler.timeout.IdleState;
+import org.apache.fluss.shaded.netty4.io.netty.handler.timeout.IdleStateEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/server/ServerChannelInitializer.java b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/server/ServerChannelInitializer.java
index 9b895a82b..ea095d73d 100644
--- a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/server/ServerChannelInitializer.java
+++ b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/server/ServerChannelInitializer.java
@@ -20,11 +20,11 @@ package com.alibaba.fluss.rpc.netty.server;
import com.alibaba.fluss.rpc.netty.NettyChannelInitializer;
import com.alibaba.fluss.rpc.protocol.ApiManager;
import com.alibaba.fluss.security.auth.ServerAuthenticator;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelInitializer;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.socket.SocketChannel;
import com.alibaba.fluss.utils.MathUtils;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelInitializer;
+import org.apache.fluss.shaded.netty4.io.netty.channel.socket.SocketChannel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/protocol/ApiManager.java b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/protocol/ApiManager.java
index 7d8463408..92a5826d0 100644
--- a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/protocol/ApiManager.java
+++ b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/protocol/ApiManager.java
@@ -23,8 +23,8 @@ import com.alibaba.fluss.rpc.RpcGateway;
import com.alibaba.fluss.rpc.gateway.CoordinatorGateway;
import com.alibaba.fluss.rpc.gateway.TabletServerGateway;
import com.alibaba.fluss.rpc.messages.ApiMessage;
-import com.alibaba.fluss.shaded.guava32.com.google.common.collect.ImmutableList;
+import org.apache.fluss.shaded.guava32.com.google.common.collect.ImmutableList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/protocol/ApiMethod.java b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/protocol/ApiMethod.java
index bd31d6df3..1497bb78a 100644
--- a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/protocol/ApiMethod.java
+++ b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/protocol/ApiMethod.java
@@ -19,9 +19,10 @@ package com.alibaba.fluss.rpc.protocol;
import com.alibaba.fluss.cluster.ServerType;
import com.alibaba.fluss.rpc.messages.ApiMessage;
-import com.alibaba.fluss.shaded.guava32.com.google.common.collect.ImmutableList;
import com.alibaba.fluss.utils.InstantiationUtils;
+import org.apache.fluss.shaded.guava32.com.google.common.collect.ImmutableList;
+
import javax.annotation.concurrent.ThreadSafe;
import java.lang.reflect.Method;
diff --git a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/protocol/MessageCodec.java b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/protocol/MessageCodec.java
index d7d46857d..e4c2a9625 100644
--- a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/protocol/MessageCodec.java
+++ b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/protocol/MessageCodec.java
@@ -21,8 +21,9 @@ import com.alibaba.fluss.record.send.Send;
import com.alibaba.fluss.record.send.SendWritableOutput;
import com.alibaba.fluss.rpc.messages.ApiMessage;
import com.alibaba.fluss.rpc.messages.ErrorResponse;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBufAllocator;
+
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBufAllocator;
/** Utilities for encoding and decoding RPC messages. */
public final class MessageCodec {
diff --git a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/protocol/NetworkProtocolPlugin.java b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/protocol/NetworkProtocolPlugin.java
index 281ef60e7..48ff53ff5 100644
--- a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/protocol/NetworkProtocolPlugin.java
+++ b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/protocol/NetworkProtocolPlugin.java
@@ -22,7 +22,8 @@ import com.alibaba.fluss.plugin.Plugin;
import com.alibaba.fluss.rpc.RpcGatewayService;
import com.alibaba.fluss.rpc.netty.server.RequestChannel;
import com.alibaba.fluss.rpc.netty.server.RequestHandler;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelHandler;
+
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandler;
import java.util.List;
diff --git a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/util/CommonRpcMessageUtils.java b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/util/CommonRpcMessageUtils.java
index 73763b08c..b3d4a82ac 100644
--- a/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/util/CommonRpcMessageUtils.java
+++ b/fluss-rpc/src/main/java/com/alibaba/fluss/rpc/util/CommonRpcMessageUtils.java
@@ -44,7 +44,8 @@ import com.alibaba.fluss.security.acl.PermissionType;
import com.alibaba.fluss.security.acl.Resource;
import com.alibaba.fluss.security.acl.ResourceFilter;
import com.alibaba.fluss.security.acl.ResourceType;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
import java.nio.ByteBuffer;
import java.util.ArrayList;
diff --git a/fluss-rpc/src/test/java/com/alibaba/fluss/rpc/netty/client/NettyClientTest.java b/fluss-rpc/src/test/java/com/alibaba/fluss/rpc/netty/client/NettyClientTest.java
index 2e1b168f6..6eb7b6996 100644
--- a/fluss-rpc/src/test/java/com/alibaba/fluss/rpc/netty/client/NettyClientTest.java
+++ b/fluss-rpc/src/test/java/com/alibaba/fluss/rpc/netty/client/NettyClientTest.java
@@ -158,7 +158,7 @@ final class NettyClientTest {
.get())
.isInstanceOf(ExecutionException.class)
.hasMessageContaining("Disconnected from node")
- .hasRootCauseMessage("Connection refused");
+ .hasRootCauseMessage("finishConnect(..) failed: Connection refused");
assertThat(nettyClient.connections().size()).isEqualTo(0);
// restart the netty server.
diff --git a/fluss-rpc/src/test/java/com/alibaba/fluss/rpc/netty/server/NettyServerHandlerTest.java b/fluss-rpc/src/test/java/com/alibaba/fluss/rpc/netty/server/NettyServerHandlerTest.java
index 1debb3799..828a9b93d 100644
--- a/fluss-rpc/src/test/java/com/alibaba/fluss/rpc/netty/server/NettyServerHandlerTest.java
+++ b/fluss-rpc/src/test/java/com/alibaba/fluss/rpc/netty/server/NettyServerHandlerTest.java
@@ -32,13 +32,13 @@ import com.alibaba.fluss.rpc.protocol.ApiKeys;
import com.alibaba.fluss.rpc.protocol.ApiManager;
import com.alibaba.fluss.rpc.protocol.MessageCodec;
import com.alibaba.fluss.security.auth.PlainTextAuthenticationPlugin;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBufAllocator;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.Channel;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelId;
-import com.alibaba.fluss.shaded.netty4.io.netty.util.concurrent.DefaultEventExecutor;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBufAllocator;
+import org.apache.fluss.shaded.netty4.io.netty.channel.Channel;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelId;
+import org.apache.fluss.shaded.netty4.io.netty.util.concurrent.DefaultEventExecutor;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/fluss-rpc/src/test/java/com/alibaba/fluss/rpc/protocol/MessageCodecTest.java b/fluss-rpc/src/test/java/com/alibaba/fluss/rpc/protocol/MessageCodecTest.java
index 0165da897..67a56306a 100644
--- a/fluss-rpc/src/test/java/com/alibaba/fluss/rpc/protocol/MessageCodecTest.java
+++ b/fluss-rpc/src/test/java/com/alibaba/fluss/rpc/protocol/MessageCodecTest.java
@@ -32,13 +32,13 @@ import com.alibaba.fluss.rpc.netty.server.NettyServerHandler;
import com.alibaba.fluss.rpc.netty.server.RequestChannel;
import com.alibaba.fluss.rpc.netty.server.RequestsMetrics;
import com.alibaba.fluss.security.auth.PlainTextAuthenticationPlugin;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBufAllocator;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.Channel;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
-import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelId;
-import com.alibaba.fluss.shaded.netty4.io.netty.util.concurrent.EventExecutor;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBufAllocator;
+import org.apache.fluss.shaded.netty4.io.netty.channel.Channel;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
+import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelId;
+import org.apache.fluss.shaded.netty4.io.netty.util.concurrent.EventExecutor;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-rpc/src/test/java/com/alibaba/fluss/rpc/protocol/RequestChannelTest.java b/fluss-rpc/src/test/java/com/alibaba/fluss/rpc/protocol/RequestChannelTest.java
index 6b4281b03..6903c1900 100644
--- a/fluss-rpc/src/test/java/com/alibaba/fluss/rpc/protocol/RequestChannelTest.java
+++ b/fluss-rpc/src/test/java/com/alibaba/fluss/rpc/protocol/RequestChannelTest.java
@@ -22,9 +22,9 @@ import com.alibaba.fluss.rpc.messages.GetTableInfoRequest;
import com.alibaba.fluss.rpc.netty.server.FlussRequest;
import com.alibaba.fluss.rpc.netty.server.RequestChannel;
import com.alibaba.fluss.rpc.netty.server.RpcRequest;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.EmptyByteBuf;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.UnpooledByteBufAllocator;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.EmptyByteBuf;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.UnpooledByteBufAllocator;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
diff --git a/fluss-server/pom.xml b/fluss-server/pom.xml
index 6dedc3116..d35adb4d1 100644
--- a/fluss-server/pom.xml
+++ b/fluss-server/pom.xml
@@ -68,7 +68,7 @@
</dependency>
<dependency>
- <groupId>com.alibaba.fluss</groupId>
+ <groupId>org.apache.fluss</groupId>
<artifactId>fluss-shaded-zookeeper</artifactId>
</dependency>
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/authorizer/DefaultAuthorizer.java b/fluss-server/src/main/java/com/alibaba/fluss/server/authorizer/DefaultAuthorizer.java
index a614470e8..03e014add 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/authorizer/DefaultAuthorizer.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/authorizer/DefaultAuthorizer.java
@@ -36,11 +36,11 @@ import com.alibaba.fluss.server.zk.ZooKeeperClient;
import com.alibaba.fluss.server.zk.ZooKeeperUtils;
import com.alibaba.fluss.server.zk.data.ZkData.AclChangeNotificationNode;
import com.alibaba.fluss.server.zk.data.ZkData.AclChangesNode;
-import com.alibaba.fluss.shaded.guava32.com.google.common.collect.Maps;
-import com.alibaba.fluss.shaded.guava32.com.google.common.collect.Sets;
import com.alibaba.fluss.utils.clock.SystemClock;
import com.alibaba.fluss.utils.types.Tuple2;
+import org.apache.fluss.shaded.guava32.com.google.common.collect.Maps;
+import org.apache.fluss.shaded.guava32.com.google.common.collect.Sets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/authorizer/ZkNodeChangeNotificationWatcher.java b/fluss-server/src/main/java/com/alibaba/fluss/server/authorizer/ZkNodeChangeNotificationWatcher.java
index 906a8dadc..f159d0c9b 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/authorizer/ZkNodeChangeNotificationWatcher.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/authorizer/ZkNodeChangeNotificationWatcher.java
@@ -18,14 +18,14 @@
package com.alibaba.fluss.server.authorizer;
import com.alibaba.fluss.server.zk.ZooKeeperClient;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.CuratorFramework;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.CuratorCache;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.CuratorCacheListener;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.PathChildrenCacheListener;
-import com.alibaba.fluss.shaded.zookeeper3.org.apache.zookeeper.data.Stat;
import com.alibaba.fluss.utils.clock.Clock;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.CuratorCache;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.CuratorCacheListener;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.PathChildrenCacheListener;
+import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.data.Stat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,7 +33,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Optional;
-import static com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent.Type.CHILD_ADDED;
+import static org.apache.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent.Type.CHILD_ADDED;
/** A watcher to watch the change notification (create/delete/alter) in zookeeper. */
public class ZkNodeChangeNotificationWatcher {
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/coordinator/CoordinatorServer.java b/fluss-server/src/main/java/com/alibaba/fluss/server/coordinator/CoordinatorServer.java
index e8388f10f..4a40e97ab 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/coordinator/CoordinatorServer.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/coordinator/CoordinatorServer.java
@@ -44,12 +44,12 @@ import com.alibaba.fluss.server.metrics.group.CoordinatorMetricGroup;
import com.alibaba.fluss.server.zk.ZooKeeperClient;
import com.alibaba.fluss.server.zk.ZooKeeperUtils;
import com.alibaba.fluss.server.zk.data.CoordinatorAddress;
-import com.alibaba.fluss.shaded.zookeeper3.org.apache.zookeeper.KeeperException;
import com.alibaba.fluss.utils.ExceptionUtils;
import com.alibaba.fluss.utils.ExecutorUtils;
import com.alibaba.fluss.utils.concurrent.ExecutorThreadFactory;
import com.alibaba.fluss.utils.concurrent.FutureUtils;
+import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.KeeperException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/coordinator/MetadataManager.java b/fluss-server/src/main/java/com/alibaba/fluss/server/coordinator/MetadataManager.java
index d6192fc01..f102f5db7 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/coordinator/MetadataManager.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/coordinator/MetadataManager.java
@@ -46,10 +46,10 @@ import com.alibaba.fluss.server.zk.data.DatabaseRegistration;
import com.alibaba.fluss.server.zk.data.PartitionAssignment;
import com.alibaba.fluss.server.zk.data.TableAssignment;
import com.alibaba.fluss.server.zk.data.TableRegistration;
-import com.alibaba.fluss.shaded.zookeeper3.org.apache.zookeeper.KeeperException;
import com.alibaba.fluss.utils.function.RunnableWithException;
import com.alibaba.fluss.utils.function.ThrowingRunnable;
+import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.KeeperException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/coordinator/event/watcher/TableChangeWatcher.java b/fluss-server/src/main/java/com/alibaba/fluss/server/coordinator/event/watcher/TableChangeWatcher.java
index 9d4973c26..2bc4996ff 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/coordinator/event/watcher/TableChangeWatcher.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/coordinator/event/watcher/TableChangeWatcher.java
@@ -36,10 +36,10 @@ import com.alibaba.fluss.server.zk.data.TableRegistration;
import com.alibaba.fluss.server.zk.data.ZkData.DatabasesZNode;
import com.alibaba.fluss.server.zk.data.ZkData.PartitionZNode;
import com.alibaba.fluss.server.zk.data.ZkData.TableZNode;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.ChildData;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.CuratorCache;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.CuratorCacheListener;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.ChildData;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.CuratorCache;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.CuratorCacheListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/coordinator/event/watcher/TabletServerChangeWatcher.java b/fluss-server/src/main/java/com/alibaba/fluss/server/coordinator/event/watcher/TabletServerChangeWatcher.java
index e44b61f7d..0c3e91c59 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/coordinator/event/watcher/TabletServerChangeWatcher.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/coordinator/event/watcher/TabletServerChangeWatcher.java
@@ -27,11 +27,11 @@ import com.alibaba.fluss.server.zk.ZooKeeperClient;
import com.alibaba.fluss.server.zk.data.TabletServerRegistration;
import com.alibaba.fluss.server.zk.data.ZkData.ServerIdZNode;
import com.alibaba.fluss.server.zk.data.ZkData.ServerIdsZNode;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.ChildData;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.CuratorCache;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.CuratorCacheListener;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.utils.ZKPaths;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.ChildData;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.CuratorCache;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.CuratorCacheListener;
+import org.apache.fluss.shaded.curator5.org.apache.curator.utils.ZKPaths;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/coordinator/statemachine/TableBucketStateMachine.java b/fluss-server/src/main/java/com/alibaba/fluss/server/coordinator/statemachine/TableBucketStateMachine.java
index 5f0823644..98a195f2c 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/coordinator/statemachine/TableBucketStateMachine.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/coordinator/statemachine/TableBucketStateMachine.java
@@ -25,8 +25,8 @@ import com.alibaba.fluss.server.entity.BatchRegisterLeadAndIsr;
import com.alibaba.fluss.server.entity.RegisterTableBucketLeadAndIsrInfo;
import com.alibaba.fluss.server.zk.ZooKeeperClient;
import com.alibaba.fluss.server.zk.data.LeaderAndIsr;
-import com.alibaba.fluss.shaded.guava32.com.google.common.collect.Sets;
+import org.apache.fluss.shaded.guava32.com.google.common.collect.Sets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/kv/KvManager.java b/fluss-server/src/main/java/com/alibaba/fluss/server/kv/KvManager.java
index 5cc2c7253..ee518af25 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/kv/KvManager.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/kv/KvManager.java
@@ -37,13 +37,13 @@ import com.alibaba.fluss.server.kv.rowmerger.RowMerger;
import com.alibaba.fluss.server.log.LogManager;
import com.alibaba.fluss.server.log.LogTablet;
import com.alibaba.fluss.server.zk.ZooKeeperClient;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
import com.alibaba.fluss.utils.FileUtils;
import com.alibaba.fluss.utils.FlussPaths;
import com.alibaba.fluss.utils.MapUtils;
import com.alibaba.fluss.utils.types.Tuple2;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/kv/KvTablet.java b/fluss-server/src/main/java/com/alibaba/fluss/server/kv/KvTablet.java
index 5cdbba3a2..34e9d5431 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/kv/KvTablet.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/kv/KvTablet.java
@@ -57,7 +57,6 @@ import com.alibaba.fluss.server.log.LogAppendInfo;
import com.alibaba.fluss.server.log.LogTablet;
import com.alibaba.fluss.server.metrics.group.BucketMetricGroup;
import com.alibaba.fluss.server.utils.FatalErrorHandler;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
import com.alibaba.fluss.types.DataType;
import com.alibaba.fluss.types.RowType;
import com.alibaba.fluss.utils.BytesUtils;
@@ -65,6 +64,7 @@ import com.alibaba.fluss.utils.FileUtils;
import com.alibaba.fluss.utils.FlussPaths;
import com.alibaba.fluss.utils.types.Tuple2;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/kv/snapshot/CompletedSnapshotJsonSerde.java b/fluss-server/src/main/java/com/alibaba/fluss/server/kv/snapshot/CompletedSnapshotJsonSerde.java
index 9d7690561..8cf7b4b9d 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/kv/snapshot/CompletedSnapshotJsonSerde.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/kv/snapshot/CompletedSnapshotJsonSerde.java
@@ -19,12 +19,13 @@ package com.alibaba.fluss.server.kv.snapshot;
import com.alibaba.fluss.fs.FsPath;
import com.alibaba.fluss.metadata.TableBucket;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import com.alibaba.fluss.utils.json.JsonDeserializer;
import com.alibaba.fluss.utils.json.JsonSerdeUtils;
import com.alibaba.fluss.utils.json.JsonSerializer;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/log/LogSegment.java b/fluss-server/src/main/java/com/alibaba/fluss/server/log/LogSegment.java
index 20632c755..9cd8b60b2 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/log/LogSegment.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/log/LogSegment.java
@@ -32,10 +32,10 @@ import com.alibaba.fluss.record.LogRecordBatch;
import com.alibaba.fluss.record.LogRecords;
import com.alibaba.fluss.record.MemoryLogRecords;
import com.alibaba.fluss.record.TimestampAndOffset;
-import com.alibaba.fluss.shaded.guava32.com.google.common.collect.Iterables;
import com.alibaba.fluss.utils.FileUtils;
import com.alibaba.fluss.utils.FlussPaths;
+import org.apache.fluss.shaded.guava32.com.google.common.collect.Iterables;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/log/WriterStateManager.java b/fluss-server/src/main/java/com/alibaba/fluss/server/log/WriterStateManager.java
index 6163d86eb..52065392f 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/log/WriterStateManager.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/log/WriterStateManager.java
@@ -22,12 +22,12 @@ import com.alibaba.fluss.exception.CorruptSnapshotException;
import com.alibaba.fluss.exception.UnknownWriterIdException;
import com.alibaba.fluss.metadata.TableBucket;
import com.alibaba.fluss.record.LogRecordBatch;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import com.alibaba.fluss.utils.json.JsonDeserializer;
import com.alibaba.fluss.utils.json.JsonSerdeUtils;
import com.alibaba.fluss.utils.json.JsonSerializer;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/log/remote/RemoteLogManifestJsonSerde.java b/fluss-server/src/main/java/com/alibaba/fluss/server/log/remote/RemoteLogManifestJsonSerde.java
index 364e435c8..6a77e75d8 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/log/remote/RemoteLogManifestJsonSerde.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/log/remote/RemoteLogManifestJsonSerde.java
@@ -20,12 +20,13 @@ package com.alibaba.fluss.server.log.remote;
import com.alibaba.fluss.metadata.PhysicalTablePath;
import com.alibaba.fluss.metadata.TableBucket;
import com.alibaba.fluss.remote.RemoteLogSegment;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import com.alibaba.fluss.utils.json.JsonDeserializer;
import com.alibaba.fluss.utils.json.JsonSerdeUtils;
import com.alibaba.fluss.utils.json.JsonSerializer;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/replica/fetcher/ReplicaFetcherThread.java b/fluss-server/src/main/java/com/alibaba/fluss/server/replica/fetcher/ReplicaFetcherThread.java
index c769c5870..bebac896d 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/replica/fetcher/ReplicaFetcherThread.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/replica/fetcher/ReplicaFetcherThread.java
@@ -39,12 +39,12 @@ import com.alibaba.fluss.server.metrics.group.TabletServerMetricGroup;
import com.alibaba.fluss.server.replica.Replica;
import com.alibaba.fluss.server.replica.ReplicaManager;
import com.alibaba.fluss.server.replica.fetcher.LeaderEndpoint.FetchData;
-import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
import com.alibaba.fluss.utils.FileUtils;
import com.alibaba.fluss.utils.FlussPaths;
import com.alibaba.fluss.utils.concurrent.ShutdownableThread;
import com.alibaba.fluss.utils.log.FairBucketStatusMap;
+import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/tablet/TabletServer.java b/fluss-server/src/main/java/com/alibaba/fluss/server/tablet/TabletServer.java
index ce221f8d0..a2239abc1 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/tablet/TabletServer.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/tablet/TabletServer.java
@@ -46,7 +46,6 @@ import com.alibaba.fluss.server.replica.ReplicaManager;
import com.alibaba.fluss.server.zk.ZooKeeperClient;
import com.alibaba.fluss.server.zk.ZooKeeperUtils;
import com.alibaba.fluss.server.zk.data.TabletServerRegistration;
-import com.alibaba.fluss.shaded.zookeeper3.org.apache.zookeeper.KeeperException;
import com.alibaba.fluss.utils.ExceptionUtils;
import com.alibaba.fluss.utils.clock.Clock;
import com.alibaba.fluss.utils.clock.SystemClock;
@@ -54,6 +53,7 @@ import com.alibaba.fluss.utils.concurrent.FlussScheduler;
import com.alibaba.fluss.utils.concurrent.FutureUtils;
import com.alibaba.fluss.utils.concurrent.Scheduler;
+import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.KeeperException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/CuratorFrameworkWithUnhandledErrorListener.java b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/CuratorFrameworkWithUnhandledErrorListener.java
index a05f6a821..88ab92cb9 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/CuratorFrameworkWithUnhandledErrorListener.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/CuratorFrameworkWithUnhandledErrorListener.java
@@ -17,8 +17,8 @@
package com.alibaba.fluss.server.zk;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.CuratorFramework;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.api.UnhandledErrorListener;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.api.UnhandledErrorListener;
import java.io.Closeable;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/ZkSequenceIDCounter.java b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/ZkSequenceIDCounter.java
index 18d235bca..d8d963bac 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/ZkSequenceIDCounter.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/ZkSequenceIDCounter.java
@@ -18,10 +18,11 @@
package com.alibaba.fluss.server.zk;
import com.alibaba.fluss.server.SequenceIDCounter;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.CuratorFramework;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.recipes.atomic.AtomicValue;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.recipes.atomic.DistributedAtomicLong;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.retry.BoundedExponentialBackoffRetry;
+
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.recipes.atomic.AtomicValue;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.recipes.atomic.DistributedAtomicLong;
+import org.apache.fluss.shaded.curator5.org.apache.curator.retry.BoundedExponentialBackoffRetry;
import javax.annotation.concurrent.ThreadSafe;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/ZooKeeperClient.java b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/ZooKeeperClient.java
index f1899ffec..af70395ea 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/ZooKeeperClient.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/ZooKeeperClient.java
@@ -65,13 +65,13 @@ import com.alibaba.fluss.server.zk.data.ZkData.TableSequenceIdZNode;
import com.alibaba.fluss.server.zk.data.ZkData.TableZNode;
import com.alibaba.fluss.server.zk.data.ZkData.TablesZNode;
import com.alibaba.fluss.server.zk.data.ZkData.WriterIdZNode;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.CuratorFramework;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.api.transaction.CuratorOp;
-import com.alibaba.fluss.shaded.zookeeper3.org.apache.zookeeper.CreateMode;
-import com.alibaba.fluss.shaded.zookeeper3.org.apache.zookeeper.KeeperException;
-import com.alibaba.fluss.shaded.zookeeper3.org.apache.zookeeper.data.Stat;
import com.alibaba.fluss.utils.types.Tuple2;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.api.transaction.CuratorOp;
+import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.CreateMode;
+import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.KeeperException;
+import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.data.Stat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/ZooKeeperUtils.java b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/ZooKeeperUtils.java
index bc8b91d45..bd0b6f60c 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/ZooKeeperUtils.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/ZooKeeperUtils.java
@@ -21,18 +21,18 @@ import com.alibaba.fluss.annotation.VisibleForTesting;
import com.alibaba.fluss.config.ConfigOptions;
import com.alibaba.fluss.config.Configuration;
import com.alibaba.fluss.server.utils.FatalErrorHandler;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.CuratorFramework;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.CuratorFrameworkFactory;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.api.UnhandledErrorListener;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.state.ConnectionState;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.state.ConnectionStateListener;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.state.SessionConnectionStateErrorPolicy;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.retry.ExponentialBackoffRetry;
-import com.alibaba.fluss.shaded.zookeeper3.org.apache.zookeeper.client.ZKClientConfig;
-import com.alibaba.fluss.shaded.zookeeper3.org.apache.zookeeper.server.quorum.QuorumPeerConfig;
import com.alibaba.fluss.utils.function.ThrowingRunnable;
import org.apache.commons.lang3.StringUtils;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.CuratorFrameworkFactory;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.api.UnhandledErrorListener;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.state.ConnectionState;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.state.ConnectionStateListener;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.state.SessionConnectionStateErrorPolicy;
+import org.apache.fluss.shaded.curator5.org.apache.curator.retry.ExponentialBackoffRetry;
+import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.client.ZKClientConfig;
+import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.server.quorum.QuorumPeerConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/BucketSnapshotJsonSerde.java b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/BucketSnapshotJsonSerde.java
index 0de205428..84046a0cf 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/BucketSnapshotJsonSerde.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/BucketSnapshotJsonSerde.java
@@ -18,11 +18,12 @@
package com.alibaba.fluss.server.zk.data;
import com.alibaba.fluss.annotation.Internal;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import com.alibaba.fluss.utils.json.JsonDeserializer;
import com.alibaba.fluss.utils.json.JsonSerializer;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+
import java.io.IOException;
/** Json serializer and deserializer for {@link BucketSnapshot}. */
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/CoordinatorAddressJsonSerde.java b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/CoordinatorAddressJsonSerde.java
index 09302098a..cf876b268 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/CoordinatorAddressJsonSerde.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/CoordinatorAddressJsonSerde.java
@@ -19,11 +19,12 @@ package com.alibaba.fluss.server.zk.data;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.cluster.Endpoint;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import com.alibaba.fluss.utils.json.JsonDeserializer;
import com.alibaba.fluss.utils.json.JsonSerializer;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/DatabaseRegistrationJsonSerde.java b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/DatabaseRegistrationJsonSerde.java
index b3fe27608..4483ae437 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/DatabaseRegistrationJsonSerde.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/DatabaseRegistrationJsonSerde.java
@@ -17,11 +17,12 @@
package com.alibaba.fluss.server.zk.data;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import com.alibaba.fluss.utils.json.JsonDeserializer;
import com.alibaba.fluss.utils.json.JsonSerializer;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+
import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/LakeTableSnapshotJsonSerde.java b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/LakeTableSnapshotJsonSerde.java
index 6a1df0bea..d35048d67 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/LakeTableSnapshotJsonSerde.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/LakeTableSnapshotJsonSerde.java
@@ -18,11 +18,12 @@
package com.alibaba.fluss.server.zk.data;
import com.alibaba.fluss.metadata.TableBucket;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import com.alibaba.fluss.utils.json.JsonDeserializer;
import com.alibaba.fluss.utils.json.JsonSerializer;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+
import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/LeaderAndIsrJsonSerde.java b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/LeaderAndIsrJsonSerde.java
index 4ad33bf84..b839ead5c 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/LeaderAndIsrJsonSerde.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/LeaderAndIsrJsonSerde.java
@@ -18,11 +18,12 @@
package com.alibaba.fluss.server.zk.data;
import com.alibaba.fluss.annotation.Internal;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import com.alibaba.fluss.utils.json.JsonDeserializer;
import com.alibaba.fluss.utils.json.JsonSerializer;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/PartitionAssignmentJsonSerde.java b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/PartitionAssignmentJsonSerde.java
index 472d28165..a48b1d1db 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/PartitionAssignmentJsonSerde.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/PartitionAssignmentJsonSerde.java
@@ -18,11 +18,12 @@
package com.alibaba.fluss.server.zk.data;
import com.alibaba.fluss.annotation.Internal;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import com.alibaba.fluss.utils.json.JsonDeserializer;
import com.alibaba.fluss.utils.json.JsonSerializer;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+
import java.io.IOException;
import java.util.Map;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/RemoteLogManifestHandleJsonSerde.java b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/RemoteLogManifestHandleJsonSerde.java
index 2d4ce68b6..1d7646d6d 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/RemoteLogManifestHandleJsonSerde.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/RemoteLogManifestHandleJsonSerde.java
@@ -18,11 +18,12 @@
package com.alibaba.fluss.server.zk.data;
import com.alibaba.fluss.annotation.Internal;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import com.alibaba.fluss.utils.json.JsonDeserializer;
import com.alibaba.fluss.utils.json.JsonSerializer;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+
import java.io.IOException;
import static com.alibaba.fluss.server.zk.data.RemoteLogManifestHandle.fromRemoteLogManifestPath;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/ResourceAclJsonSerde.java b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/ResourceAclJsonSerde.java
index 82d8f4f6a..303880518 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/ResourceAclJsonSerde.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/ResourceAclJsonSerde.java
@@ -21,11 +21,12 @@ import com.alibaba.fluss.security.acl.AccessControlEntry;
import com.alibaba.fluss.security.acl.FlussPrincipal;
import com.alibaba.fluss.security.acl.OperationType;
import com.alibaba.fluss.security.acl.PermissionType;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import com.alibaba.fluss.utils.json.JsonDeserializer;
import com.alibaba.fluss.utils.json.JsonSerializer;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+
import java.io.IOException;
import java.util.Collection;
import java.util.HashSet;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/TableAssignmentJsonSerde.java b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/TableAssignmentJsonSerde.java
index e64b325c0..3aef82086 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/TableAssignmentJsonSerde.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/TableAssignmentJsonSerde.java
@@ -18,11 +18,12 @@
package com.alibaba.fluss.server.zk.data;
import com.alibaba.fluss.annotation.Internal;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import com.alibaba.fluss.utils.json.JsonDeserializer;
import com.alibaba.fluss.utils.json.JsonSerializer;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/TableRegistrationJsonSerde.java b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/TableRegistrationJsonSerde.java
index 5a0f6ccc3..965a6e6a3 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/TableRegistrationJsonSerde.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/TableRegistrationJsonSerde.java
@@ -19,11 +19,12 @@ package com.alibaba.fluss.server.zk.data;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.metadata.TableDescriptor.TableDistribution;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import com.alibaba.fluss.utils.json.JsonDeserializer;
import com.alibaba.fluss.utils.json.JsonSerializer;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/TabletServerRegistrationJsonSerde.java b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/TabletServerRegistrationJsonSerde.java
index 48e0308a2..d00037e13 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/TabletServerRegistrationJsonSerde.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/zk/data/TabletServerRegistrationJsonSerde.java
@@ -19,11 +19,12 @@ package com.alibaba.fluss.server.zk.data;
import com.alibaba.fluss.annotation.Internal;
import com.alibaba.fluss.cluster.Endpoint;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import com.alibaba.fluss.utils.json.JsonDeserializer;
import com.alibaba.fluss.utils.json.JsonSerializer;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
diff --git a/fluss-server/src/main/resources/META-INF/NOTICE b/fluss-server/src/main/resources/META-INF/NOTICE
index fb2b8a315..817956f1a 100644
--- a/fluss-server/src/main/resources/META-INF/NOTICE
+++ b/fluss-server/src/main/resources/META-INF/NOTICE
@@ -15,6 +15,11 @@ This project bundles the following dependencies under the Apache Software Licens
- org.apache.commons:commons-math3:3.6.1
- org.lz4:lz4-java:1.8.0
- org.xerial.snappy:snappy-java:1.1.10.4
+- org.apache.fluss:fluss-shaded-arrow:15.0.0-1.0-incubating
+- org.apache.fluss:fluss-shaded-guava:32.1.3-jre-1.0-incubating
+- org.apache.fluss:fluss-shaded-jackson:2.15.3-1.0-incubating
+- org.apache.fluss:fluss-shaded-netty:4.1.104.Final-1.0-incubating
+- org.apache.fluss:fluss-shaded-zookeeper:3.8.3-1.0-incubating
This project bundles the following dependencies under the MIT (https://opensource.org/licenses/MIT)
See bundled license files for details.
diff --git a/fluss-server/src/test/java/com/alibaba/fluss/server/ServerTestBase.java b/fluss-server/src/test/java/com/alibaba/fluss/server/ServerTestBase.java
index 9a5a0da8e..ba6e03011 100644
--- a/fluss-server/src/test/java/com/alibaba/fluss/server/ServerTestBase.java
+++ b/fluss-server/src/test/java/com/alibaba/fluss/server/ServerTestBase.java
@@ -27,9 +27,9 @@ import com.alibaba.fluss.server.zk.ZooKeeperClient;
import com.alibaba.fluss.server.zk.ZooKeeperExtension;
import com.alibaba.fluss.server.zk.data.ZkData.CoordinatorZNode;
import com.alibaba.fluss.server.zk.data.ZkData.ServerIdZNode;
-import com.alibaba.fluss.shaded.zookeeper3.org.apache.zookeeper.data.Stat;
import com.alibaba.fluss.testutils.common.AllCallbackWrapper;
+import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.data.Stat;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/fluss-server/src/test/java/com/alibaba/fluss/server/coordinator/statemachine/TableBucketStateMachineTest.java b/fluss-server/src/test/java/com/alibaba/fluss/server/coordinator/statemachine/TableBucketStateMachineTest.java
index 21be60dea..4a77c1360 100644
--- a/fluss-server/src/test/java/com/alibaba/fluss/server/coordinator/statemachine/TableBucketStateMachineTest.java
+++ b/fluss-server/src/test/java/com/alibaba/fluss/server/coordinator/statemachine/TableBucketStateMachineTest.java
@@ -40,10 +40,10 @@ import com.alibaba.fluss.server.zk.NOPErrorHandler;
import com.alibaba.fluss.server.zk.ZooKeeperClient;
import com.alibaba.fluss.server.zk.ZooKeeperExtension;
import com.alibaba.fluss.server.zk.data.LeaderAndIsr;
-import com.alibaba.fluss.shaded.guava32.com.google.common.collect.Sets;
import com.alibaba.fluss.testutils.common.AllCallbackWrapper;
import com.alibaba.fluss.utils.concurrent.ExecutorThreadFactory;
+import org.apache.fluss.shaded.guava32.com.google.common.collect.Sets;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-server/src/test/java/com/alibaba/fluss/server/kv/KvTabletTest.java b/fluss-server/src/test/java/com/alibaba/fluss/server/kv/KvTabletTest.java
index d4e74bdc3..a1613e9f1 100644
--- a/fluss-server/src/test/java/com/alibaba/fluss/server/kv/KvTabletTest.java
+++ b/fluss-server/src/test/java/com/alibaba/fluss/server/kv/KvTabletTest.java
@@ -48,13 +48,13 @@ import com.alibaba.fluss.server.log.FetchIsolation;
import com.alibaba.fluss.server.log.LogAppendInfo;
import com.alibaba.fluss.server.log.LogTablet;
import com.alibaba.fluss.server.log.LogTestUtils;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
import com.alibaba.fluss.types.DataTypes;
import com.alibaba.fluss.types.RowType;
import com.alibaba.fluss.types.StringType;
import com.alibaba.fluss.utils.clock.SystemClock;
import com.alibaba.fluss.utils.concurrent.FlussScheduler;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-server/src/test/java/com/alibaba/fluss/server/kv/snapshot/PeriodicSnapshotManagerTest.java b/fluss-server/src/test/java/com/alibaba/fluss/server/kv/snapshot/PeriodicSnapshotManagerTest.java
index d68af6053..0c8c16acc 100644
--- a/fluss-server/src/test/java/com/alibaba/fluss/server/kv/snapshot/PeriodicSnapshotManagerTest.java
+++ b/fluss-server/src/test/java/com/alibaba/fluss/server/kv/snapshot/PeriodicSnapshotManagerTest.java
@@ -37,8 +37,8 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.FutureTask;
import java.util.concurrent.RunnableFuture;
-import static com.alibaba.fluss.shaded.guava32.com.google.common.collect.Iterators.getOnlyElement;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.fluss.shaded.guava32.com.google.common.collect.Iterators.getOnlyElement;
import static org.assertj.core.api.Assertions.assertThat;
/** Test for {@link PeriodicSnapshotManager} . */
diff --git a/fluss-server/src/test/java/com/alibaba/fluss/server/kv/wal/ArrowWalBuilderTest.java b/fluss-server/src/test/java/com/alibaba/fluss/server/kv/wal/ArrowWalBuilderTest.java
index 491326664..626f4e8bc 100644
--- a/fluss-server/src/test/java/com/alibaba/fluss/server/kv/wal/ArrowWalBuilderTest.java
+++ b/fluss-server/src/test/java/com/alibaba/fluss/server/kv/wal/ArrowWalBuilderTest.java
@@ -28,10 +28,10 @@ import com.alibaba.fluss.record.ChangeType;
import com.alibaba.fluss.record.MemoryLogRecords;
import com.alibaba.fluss.row.arrow.ArrowWriterPool;
import com.alibaba.fluss.row.arrow.ArrowWriterProvider;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
-import com.alibaba.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
import com.alibaba.fluss.utils.types.Tuple2;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
+import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-server/src/test/java/com/alibaba/fluss/server/log/remote/DefaultRemoteLogStorageTest.java b/fluss-server/src/test/java/com/alibaba/fluss/server/log/remote/DefaultRemoteLogStorageTest.java
index d765defb8..4093f525a 100644
--- a/fluss-server/src/test/java/com/alibaba/fluss/server/log/remote/DefaultRemoteLogStorageTest.java
+++ b/fluss-server/src/test/java/com/alibaba/fluss/server/log/remote/DefaultRemoteLogStorageTest.java
@@ -24,9 +24,9 @@ import com.alibaba.fluss.metadata.TableBucket;
import com.alibaba.fluss.remote.RemoteLogSegment;
import com.alibaba.fluss.server.log.LogTablet;
import com.alibaba.fluss.server.log.remote.RemoteLogStorage.IndexType;
-import com.alibaba.fluss.shaded.guava32.com.google.common.io.Files;
import com.alibaba.fluss.utils.FlussPaths;
+import org.apache.fluss.shaded.guava32.com.google.common.io.Files;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
diff --git a/fluss-server/src/test/java/com/alibaba/fluss/server/zk/ZooKeeperClientTest.java b/fluss-server/src/test/java/com/alibaba/fluss/server/zk/ZooKeeperClientTest.java
index 81cc59b3d..ebb1461bd 100644
--- a/fluss-server/src/test/java/com/alibaba/fluss/server/zk/ZooKeeperClientTest.java
+++ b/fluss-server/src/test/java/com/alibaba/fluss/server/zk/ZooKeeperClientTest.java
@@ -36,14 +36,14 @@ import com.alibaba.fluss.server.zk.data.PartitionAssignment;
import com.alibaba.fluss.server.zk.data.TableAssignment;
import com.alibaba.fluss.server.zk.data.TableRegistration;
import com.alibaba.fluss.server.zk.data.TabletServerRegistration;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.CuratorZookeeperClient;
-import com.alibaba.fluss.shaded.curator5.org.apache.curator.framework.CuratorFramework;
-import com.alibaba.fluss.shaded.zookeeper3.org.apache.zookeeper.ZooKeeper;
-import com.alibaba.fluss.shaded.zookeeper3.org.apache.zookeeper.client.ZKClientConfig;
import com.alibaba.fluss.testutils.common.AllCallbackWrapper;
import com.alibaba.fluss.types.DataTypes;
import com.alibaba.fluss.utils.types.Tuple2;
+import org.apache.fluss.shaded.curator5.org.apache.curator.CuratorZookeeperClient;
+import org.apache.fluss.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.ZooKeeper;
+import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.client.ZKClientConfig;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
diff --git a/fluss-server/src/test/java/com/alibaba/fluss/server/zk/ZooKeeperExtension.java b/fluss-server/src/test/java/com/alibaba/fluss/server/zk/ZooKeeperExtension.java
index e9972e76c..09edda011 100644
--- a/fluss-server/src/test/java/com/alibaba/fluss/server/zk/ZooKeeperExtension.java
+++ b/fluss-server/src/test/java/com/alibaba/fluss/server/zk/ZooKeeperExtension.java
@@ -18,10 +18,10 @@
package com.alibaba.fluss.server.zk;
import com.alibaba.fluss.server.utils.FatalErrorHandler;
-import com.alibaba.fluss.shaded.zookeeper3.org.apache.zookeeper.KeeperException;
import com.alibaba.fluss.testutils.common.CustomExtension;
import org.apache.curator.test.TestingServer;
+import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.server.ZooKeeperServer;
import org.junit.jupiter.api.extension.Extension;
import org.junit.jupiter.api.extension.ExtensionContext;
diff --git a/fluss-server/src/test/java/com/alibaba/fluss/server/zk/data/CoordinatorAddressJsonSerdeTest.java b/fluss-server/src/test/java/com/alibaba/fluss/server/zk/data/CoordinatorAddressJsonSerdeTest.java
index 98fb17858..fc7e94ee8 100644
--- a/fluss-server/src/test/java/com/alibaba/fluss/server/zk/data/CoordinatorAddressJsonSerdeTest.java
+++ b/fluss-server/src/test/java/com/alibaba/fluss/server/zk/data/CoordinatorAddressJsonSerdeTest.java
@@ -18,10 +18,10 @@
package com.alibaba.fluss.server.zk.data;
import com.alibaba.fluss.cluster.Endpoint;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
import com.alibaba.fluss.utils.json.JsonSerdeTestBase;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/fluss-server/src/test/java/com/alibaba/fluss/server/zk/data/DatabaseRegistrationJsonSerdeTest.java b/fluss-server/src/test/java/com/alibaba/fluss/server/zk/data/DatabaseRegistrationJsonSerdeTest.java
index 24b641a3b..3f6d51de2 100644
--- a/fluss-server/src/test/java/com/alibaba/fluss/server/zk/data/DatabaseRegistrationJsonSerdeTest.java
+++ b/fluss-server/src/test/java/com/alibaba/fluss/server/zk/data/DatabaseRegistrationJsonSerdeTest.java
@@ -17,9 +17,10 @@
package com.alibaba.fluss.server.zk.data;
-import com.alibaba.fluss.shaded.guava32.com.google.common.collect.Maps;
import com.alibaba.fluss.utils.json.JsonSerdeTestBase;
+import org.apache.fluss.shaded.guava32.com.google.common.collect.Maps;
+
import java.util.Collections;
/** Test for {@link DatabaseRegistrationJsonSerde}. */
diff --git a/fluss-server/src/test/java/com/alibaba/fluss/server/zk/data/TableRegistrationJsonSerdeTest.java b/fluss-server/src/test/java/com/alibaba/fluss/server/zk/data/TableRegistrationJsonSerdeTest.java
index 7fa001b06..25f106d49 100644
--- a/fluss-server/src/test/java/com/alibaba/fluss/server/zk/data/TableRegistrationJsonSerdeTest.java
+++ b/fluss-server/src/test/java/com/alibaba/fluss/server/zk/data/TableRegistrationJsonSerdeTest.java
@@ -20,9 +20,9 @@ package com.alibaba.fluss.server.zk.data;
import com.alibaba.fluss.metadata.TableDescriptor;
import com.alibaba.fluss.metadata.TableDescriptor.TableDistribution;
import com.alibaba.fluss.record.TestData;
-import com.alibaba.fluss.shaded.guava32.com.google.common.collect.Maps;
import com.alibaba.fluss.utils.json.JsonSerdeTestBase;
+import org.apache.fluss.shaded.guava32.com.google.common.collect.Maps;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
diff --git a/fluss-server/src/test/java/com/alibaba/fluss/server/zk/data/TabletServerRegistrationJsonSerdeTest.java b/fluss-server/src/test/java/com/alibaba/fluss/server/zk/data/TabletServerRegistrationJsonSerdeTest.java
index 1086153b2..ef6d3abb0 100644
--- a/fluss-server/src/test/java/com/alibaba/fluss/server/zk/data/TabletServerRegistrationJsonSerdeTest.java
+++ b/fluss-server/src/test/java/com/alibaba/fluss/server/zk/data/TabletServerRegistrationJsonSerdeTest.java
@@ -18,10 +18,10 @@
package com.alibaba.fluss.server.zk.data;
import com.alibaba.fluss.cluster.Endpoint;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
-import com.alibaba.fluss.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
import com.alibaba.fluss.utils.json.JsonSerdeTestBase;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/pom.xml b/pom.xml
index c91242dfc..3abe734be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,12 +92,12 @@
<skip.on.java8>false</skip.on.java8>
<!-- library versions in fluss-shaded -->
- <fluss.shaded.version>2.2</fluss.shaded.version>
+ <fluss.shaded.version>1.0-incubating</fluss.shaded.version>
<guava.version>32.1.3-jre</guava.version>
<jackson.version>2.15.3</jackson.version>
<zookeeper.version>3.8.3</zookeeper.version>
<curator.version>5.4.0</curator.version>
- <netty.version>4.1.104</netty.version>
+ <netty.version>4.1.104.Final</netty.version>
<arrow.version>15.0.0</arrow.version>
<paimon.version>1.2.0</paimon.version>
<!-- todo: Revisit to add support as per Iceberg 1.9.1 post #1195 merge for Java 11 support-->
@@ -314,19 +314,19 @@
</dependency>
<dependency>
- <groupId>com.alibaba.fluss</groupId>
+ <groupId>org.apache.fluss</groupId>
<artifactId>fluss-shaded-guava</artifactId>
<version>${guava.version}-${fluss.shaded.version}</version>
</dependency>
<dependency>
- <groupId>com.alibaba.fluss</groupId>
+ <groupId>org.apache.fluss</groupId>
<artifactId>fluss-shaded-jackson</artifactId>
<version>${jackson.version}-${fluss.shaded.version}</version>
</dependency>
<dependency>
- <groupId>com.alibaba.fluss</groupId>
+ <groupId>org.apache.fluss</groupId>
<artifactId>fluss-shaded-zookeeper</artifactId>
<version>${zookeeper.version}-${fluss.shaded.version}</version>
</dependency>
@@ -339,13 +339,13 @@
</dependency>
<dependency>
- <groupId>com.alibaba.fluss</groupId>
+ <groupId>org.apache.fluss</groupId>
<artifactId>fluss-shaded-netty</artifactId>
<version>${netty.version}-${fluss.shaded.version}</version>
</dependency>
<dependency>
- <groupId>com.alibaba.fluss</groupId>
+ <groupId>org.apache.fluss</groupId>
<artifactId>fluss-shaded-arrow</artifactId>
<version>${arrow.version}-${fluss.shaded.version}</version>
</dependency>
diff --git a/tools/ci/fluss-ci-tools/pom.xml b/tools/ci/fluss-ci-tools/pom.xml
index 914792132..c557323b3 100644
--- a/tools/ci/fluss-ci-tools/pom.xml
+++ b/tools/ci/fluss-ci-tools/pom.xml
@@ -34,8 +34,9 @@
<dependencies>
<dependency>
- <groupId>com.alibaba.fluss</groupId>
+ <groupId>org.apache.fluss</groupId>
<artifactId>fluss-shaded-guava</artifactId>
+ <version>${guava.version}-${fluss.shaded.version}</version>
</dependency>
<dependency>
diff --git a/tools/ci/fluss-ci-tools/src/main/java/com/alibaba/fluss/tools/ci/utils/shared/DependencyTree.java b/tools/ci/fluss-ci-tools/src/main/java/com/alibaba/fluss/tools/ci/utils/shared/DependencyTree.java
index 051bfccb3..a9f8c5065 100644
--- a/tools/ci/fluss-ci-tools/src/main/java/com/alibaba/fluss/tools/ci/utils/shared/DependencyTree.java
+++ b/tools/ci/fluss-ci-tools/src/main/java/com/alibaba/fluss/tools/ci/utils/shared/DependencyTree.java
@@ -17,7 +17,7 @@
package com.alibaba.fluss.tools.ci.utils.shared;
-import com.alibaba.fluss.shaded.guava32.com.google.common.graph.Traverser;
+import org.apache.fluss.shaded.guava32.com.google.common.graph.Traverser;
import javax.annotation.Nullable;
diff --git a/tools/ci/log4j.properties b/tools/ci/log4j.properties
index 3425be356..18571a86b 100644
--- a/tools/ci/log4j.properties
+++ b/tools/ci/log4j.properties
@@ -64,7 +64,7 @@ logger.zookeeper_FinalRequestProcessor.name = org.apache.zookeeper.server.FinalR
logger.zookeeper_FinalRequestProcessor.level = DEBUG
logger.zookeeper_FinalRequestProcessor.additivity = false
logger.zookeeper_FinalRequestProcessor.appenderRef.zk.ref = ZooKeeperServerAppender
-logger.shaded_zookeeper.name = com.alibaba.fluss.shaded.zookeeper3
+logger.shaded_zookeeper.name = org.apache.fluss.shaded.zookeeper3
logger.shaded_zookeeper.level = INFO
logger.shaded_zookeeper.additivity = false
logger.shaded_zookeeper.appenderRef.zk.ref = ZooKeeperClientAppender
\ No newline at end of file