diff --git a/client-mr/core/pom.xml b/client-mr/core/pom.xml
index 2a47ca320f..f92572f54f 100644
--- a/client-mr/core/pom.xml
+++ b/client-mr/core/pom.xml
@@ -65,7 +65,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-common</artifactId>
+            <artifactId>${hadoop-client-api.artifactId}</artifactId>
             <version>${hadoop.version}</version>
             <exclusions>
                 <exclusion>
diff --git a/client-mr/hadoop2.8/pom.xml b/client-mr/hadoop2.8/pom.xml
index 80d5f87c36..acaa3f99fb 100644
--- a/client-mr/hadoop2.8/pom.xml
+++ b/client-mr/hadoop2.8/pom.xml
@@ -31,7 +31,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
+      <artifactId>${hadoop-client-api.artifactId}</artifactId>
       <version>${hadoop.version}</version>
       <exclusions>
         <exclusion>
diff --git a/client-mr/hadoop3.2/pom.xml b/client-mr/hadoop3.2/pom.xml
index db30cf2d5a..e439554180 100644
--- a/client-mr/hadoop3.2/pom.xml
+++ b/client-mr/hadoop3.2/pom.xml
@@ -31,7 +31,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
+      <artifactId>${hadoop-client-api.artifactId}</artifactId>
       <version>${hadoop.version}</version>
       <exclusions>
         <exclusion>
diff --git a/client-spark/common/pom.xml b/client-spark/common/pom.xml
index b233a86a2b..853bdbacd3 100644
--- a/client-spark/common/pom.xml
+++ b/client-spark/common/pom.xml
@@ -71,7 +71,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-minicluster</artifactId>
+            <artifactId>${hadoop-minicluster.artifactId}</artifactId>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
diff --git a/client-spark/spark2/pom.xml b/client-spark/spark2/pom.xml
index b2a6e0cc3b..7d511da1b0 100644
--- a/client-spark/spark2/pom.xml
+++ b/client-spark/spark2/pom.xml
@@ -60,7 +60,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-minicluster</artifactId>
+      <artifactId>${hadoop-minicluster.artifactId}</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/client-spark/spark3/pom.xml b/client-spark/spark3/pom.xml
index cea3c88ada..a86e7f0b4c 100644
--- a/client-spark/spark3/pom.xml
+++ b/client-spark/spark3/pom.xml
@@ -88,7 +88,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-minicluster</artifactId>
+            <artifactId>${hadoop-minicluster.artifactId}</artifactId>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
diff --git a/client-spark/spark4/pom.xml b/client-spark/spark4/pom.xml
index 5427d53fc0..f16857b143 100644
--- a/client-spark/spark4/pom.xml
+++ b/client-spark/spark4/pom.xml
@@ -109,7 +109,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-minicluster</artifactId>
+            <artifactId>${hadoop-minicluster.artifactId}</artifactId>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
diff --git a/client-tez/pom.xml b/client-tez/pom.xml
index 119e8aef22..547f9c162c 100644
--- a/client-tez/pom.xml
+++ b/client-tez/pom.xml
@@ -93,7 +93,7 @@
 
       <dependency>
         <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-common</artifactId>
+        <artifactId>${hadoop-client-api.artifactId}</artifactId>
         <exclusions>
           <exclusion>
             <groupId>com.sun.jersey</groupId>
@@ -130,7 +130,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-minicluster</artifactId>
+        <artifactId>${hadoop-minicluster.artifactId}</artifactId>
         <scope>test</scope>
         <exclusions>
           <exclusion>
diff --git a/client/pom.xml b/client/pom.xml
index 44d375fdb2..b654f34fb2 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -37,6 +37,12 @@
       <groupId>org.apache.uniffle</groupId>
       <artifactId>shuffle-storage</artifactId>
     </dependency>
+    <!-- commons-io in shuffle-storage follows hadoop.scope; add it explicitly for client tests. -->
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.uniffle</groupId>
       <artifactId>shuffle-storage</artifactId>
@@ -50,7 +56,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
+      <artifactId>${hadoop-client-api.artifactId}</artifactId>
       <exclusions>
         <exclusion>
           <groupId>com.sun.jersey</groupId>
@@ -68,7 +74,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-minicluster</artifactId>
+      <artifactId>${hadoop-minicluster.artifactId}</artifactId>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
diff --git a/common/pom.xml b/common/pom.xml
index 86f48b6769..d2cd976ae7 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -104,7 +104,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
+      <artifactId>${hadoop-client-api.artifactId}</artifactId>
       <exclusions>
         <exclusion>
           <groupId>com.google.protobuf</groupId>
@@ -136,7 +136,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-minicluster</artifactId>
+      <artifactId>${hadoop-minicluster.artifactId}</artifactId>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
diff --git a/coordinator/pom.xml b/coordinator/pom.xml
index 9cb3b10297..0cb35cd6cd 100644
--- a/coordinator/pom.xml
+++ b/coordinator/pom.xml
@@ -40,6 +40,10 @@
       <groupId>org.apache.uniffle</groupId>
       <artifactId>rss-internal-client</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java-util</artifactId>
@@ -78,7 +82,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
+      <artifactId>${hadoop-client-api.artifactId}</artifactId>
       <exclusions>
         <exclusion>
           <groupId>com.sun.jersey</groupId>
diff --git a/integration-test/common/pom.xml b/integration-test/common/pom.xml
index 9af6514b23..4a33b38c36 100644
--- a/integration-test/common/pom.xml
+++ b/integration-test/common/pom.xml
@@ -85,7 +85,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-minicluster</artifactId>
+            <artifactId>${hadoop-minicluster.artifactId}</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>com.sun.jersey</groupId>
diff --git a/integration-test/mr/pom.xml b/integration-test/mr/pom.xml
index eff3040a9b..e7d1e4b03a 100644
--- a/integration-test/mr/pom.xml
+++ b/integration-test/mr/pom.xml
@@ -62,7 +62,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-minicluster</artifactId>
+            <artifactId>${hadoop-minicluster.artifactId}</artifactId>
             <version>${hadoop.version}</version>
             <scope>test</scope>
             <exclusions>
@@ -107,7 +107,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-common</artifactId>
+            <artifactId>${hadoop-client-api.artifactId}</artifactId>
             <version>${hadoop.version}</version>
             <exclusions>
                 <exclusion>
diff --git a/integration-test/spark-common/pom.xml b/integration-test/spark-common/pom.xml
index 028e59b614..dabd527b70 100644
--- a/integration-test/spark-common/pom.xml
+++ b/integration-test/spark-common/pom.xml
@@ -152,7 +152,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-minicluster</artifactId>
+      <artifactId>${hadoop-minicluster.artifactId}</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/integration-test/spark2/pom.xml b/integration-test/spark2/pom.xml
index 0306af729f..b599762b8f 100644
--- a/integration-test/spark2/pom.xml
+++ b/integration-test/spark2/pom.xml
@@ -153,7 +153,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-minicluster</artifactId>
+      <artifactId>${hadoop-minicluster.artifactId}</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/integration-test/spark3/pom.xml b/integration-test/spark3/pom.xml
index d76dc07866..bee088e108 100644
--- a/integration-test/spark3/pom.xml
+++ b/integration-test/spark3/pom.xml
@@ -137,7 +137,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-minicluster</artifactId>
+            <artifactId>${hadoop-minicluster.artifactId}</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
diff --git a/integration-test/spark4/pom.xml b/integration-test/spark4/pom.xml
index 801c1a1c47..ba69a41811 100644
--- a/integration-test/spark4/pom.xml
+++ b/integration-test/spark4/pom.xml
@@ -137,7 +137,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-minicluster</artifactId>
+            <artifactId>${hadoop-minicluster.artifactId}</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
diff --git a/integration-test/tez/pom.xml b/integration-test/tez/pom.xml
index f5992c146f..794f3c13c1 100644
--- a/integration-test/tez/pom.xml
+++ b/integration-test/tez/pom.xml
@@ -105,7 +105,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-minicluster</artifactId>
+      <artifactId>${hadoop-minicluster.artifactId}</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -116,7 +116,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
+      <artifactId>${hadoop-client-api.artifactId}</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/pom.xml b/pom.xml
index f2986290fb..031e987f31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,7 @@
     <awaitility.version>4.2.0</awaitility.version>
     <checkstyle.version>9.3</checkstyle.version>
     <commons-collections4.version>4.4</commons-collections4.version>
+    <commons-io.version>2.16.1</commons-io.version>
     <commons-logging.version>1.2</commons-logging.version>
     <commons-lang3.version>3.10</commons-lang3.version>
     <commons-codec.version>1.9</commons-codec.version>
@@ -69,6 +70,9 @@
     <guava.version>32.1.3-jre</guava.version>
     <hadoop.scope>provided</hadoop.scope>
     <hadoop.version>2.8.5</hadoop.version>
+    <hadoop-client-api.artifactId>hadoop-common</hadoop-client-api.artifactId>
+    <hadoop-client-runtime.artifactId>hadoop-client</hadoop-client-runtime.artifactId>
+    <hadoop-minicluster.artifactId>hadoop-minicluster</hadoop-minicluster.artifactId>
     <httpclient.version>4.5.3</httpclient.version>
     <httpcore.version>4.4.4</httpcore.version>
     <java.version>1.8</java.version>
@@ -339,6 +343,13 @@
         <artifactId>commons-collections4</artifactId>
         <version>${commons-collections4.version}</version>
       </dependency>
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>${commons-io.version}</version>
+        <!-- commons-io introduced by hadoop-client, so mark it as hadoop scope -->
+        <scope>${hadoop.scope}</scope>
+      </dependency>
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
@@ -408,7 +419,7 @@
 
       <dependency>
         <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-common</artifactId>
+        <artifactId>${hadoop-client-api.artifactId}</artifactId>
         <version>${hadoop.version}</version>
         <scope>${hadoop.scope}</scope>
         <exclusions>
@@ -438,7 +449,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-client</artifactId>
+        <artifactId>${hadoop-client-runtime.artifactId}</artifactId>
         <version>${hadoop.version}</version>
         <scope>${hadoop.scope}</scope>
         <exclusions>
@@ -641,7 +652,7 @@
 
       <dependency>
         <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-minicluster</artifactId>
+        <artifactId>${hadoop-minicluster.artifactId}</artifactId>
         <version>${hadoop.version}</version>
         <scope>test</scope>
         <exclusions>
@@ -1973,6 +1984,14 @@
         <spark.version>4.0.2</spark.version>
         <client.type>4</client.type>
         <hadoop.version>3.4.1</hadoop.version>
+        <hadoop-client-api.artifactId>hadoop-client-api</hadoop-client-api.artifactId>
+        <hadoop-client-runtime.artifactId>hadoop-client-runtime</hadoop-client-runtime.artifactId>
+        <!--
+          Kerberos tests are skipped via uniffle.test.skip.kerberos=true for two reasons:
+          HADOOP-17324: hadoop-client-minicluster does not include Bouncy Castle; and MiniKdc
+          is not compatible with JDK 17+.
+        -->
+        <hadoop-minicluster.artifactId>hadoop-client-minicluster</hadoop-minicluster.artifactId>
         <fasterxml.jackson.version>2.12.7</fasterxml.jackson.version>
         <jetty.version>9.4.53.v20231009</jetty.version>
         <enforcer.skip>true</enforcer.skip>
@@ -2083,6 +2102,16 @@
         </dependencies>
       </dependencyManagement>
       <dependencies>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>${hadoop-client-api.artifactId}</artifactId>
+          <scope>provided</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>${hadoop-client-runtime.artifactId}</artifactId>
+          <scope>provided</scope>
+        </dependency>
         <!-- Remove log4j-slf4j-impl dependency -->
         <dependency>
           <groupId>org.apache.logging.log4j</groupId>
@@ -2124,6 +2153,14 @@
         <netty.version>4.2.7.Final</netty.version>
         <client.type>4</client.type>
         <hadoop.version>3.4.1</hadoop.version>
+        <hadoop-client-api.artifactId>hadoop-client-api</hadoop-client-api.artifactId>
+        <hadoop-client-runtime.artifactId>hadoop-client-runtime</hadoop-client-runtime.artifactId>
+        <!--
+          Kerberos tests are skipped via uniffle.test.skip.kerberos=true for two reasons:
+          HADOOP-17324: hadoop-client-minicluster does not include Bouncy Castle; and MiniKdc
+          is not compatible with JDK 17+.
+        -->
+        <hadoop-minicluster.artifactId>hadoop-client-minicluster</hadoop-minicluster.artifactId>
         <fasterxml.jackson.version>2.12.7</fasterxml.jackson.version>
         <jetty.version>9.4.53.v20231009</jetty.version>
         <enforcer.skip>true</enforcer.skip>
@@ -2240,6 +2277,16 @@
         </dependencies>
       </dependencyManagement>
       <dependencies>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>${hadoop-client-api.artifactId}</artifactId>
+          <scope>provided</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>${hadoop-client-runtime.artifactId}</artifactId>
+          <scope>provided</scope>
+        </dependency>
         <!-- Remove log4j-slf4j-impl dependency -->
         <dependency>
           <groupId>org.apache.logging.log4j</groupId>
@@ -2617,7 +2664,7 @@
           </dependency>
           <dependency>
             <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-common</artifactId>
+            <artifactId>${hadoop-client-api.artifactId}</artifactId>
             <version>${hadoop.version}</version>
             <exclusions>
               <exclusion>
@@ -2687,6 +2734,7 @@
       <properties>
         <hadoop.version>2.8.5</hadoop.version>
         <hadoop.short.version>2.8</hadoop.short.version>
+        <hadoop-minicluster.artifactId>hadoop-minicluster</hadoop-minicluster.artifactId>
       </properties>
     </profile>
     <profile>
@@ -2694,6 +2742,11 @@
       <properties>
         <hadoop.version>3.2.1</hadoop.version>
         <hadoop.short.version>3.2</hadoop.short.version>
+        <!--
+          HADOOP-17324: Hadoop 3.2.x hadoop-client-minicluster does not include the shaded
+          Bouncy Castle classes required by the Kerberos MiniDFS tests.
+        -->
+        <hadoop-minicluster.artifactId>hadoop-minicluster</hadoop-minicluster.artifactId>
         <commons-codec.version>1.11</commons-codec.version>
         <metrics.version>3.2.4</metrics.version>
       </properties>
diff --git a/server/pom.xml b/server/pom.xml
index 869f6ab15f..d1b9a67807 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -68,6 +68,10 @@
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>io.grpc</groupId>
@@ -89,7 +93,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
+      <artifactId>${hadoop-client-api.artifactId}</artifactId>
       <scope>${hadoop.scope}</scope>
       <exclusions>
         <exclusion>
@@ -100,7 +104,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-minicluster</artifactId>
+      <artifactId>${hadoop-minicluster.artifactId}</artifactId>
       <exclusions>
         <exclusion>
           <groupId>com.sun.jersey</groupId>
diff --git a/server/src/main/java/org/apache/uniffle/server/netty/ShuffleServerNettyHandler.java b/server/src/main/java/org/apache/uniffle/server/netty/ShuffleServerNettyHandler.java
index d6489deb6d..9a1bc812c9 100644
--- a/server/src/main/java/org/apache/uniffle/server/netty/ShuffleServerNettyHandler.java
+++ b/server/src/main/java/org/apache/uniffle/server/netty/ShuffleServerNettyHandler.java
@@ -27,8 +27,8 @@
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
-import org.apache.commons.collections.MapUtils;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/storage/pom.xml b/storage/pom.xml
index ac3f02ff33..a605619c07 100644
--- a/storage/pom.xml
+++ b/storage/pom.xml
@@ -32,6 +32,11 @@
   <name>Apache Uniffle Storage</name>
 
   <dependencies>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+
     <dependency>
       <artifactId>rss-internal-client</artifactId>
       <groupId>org.apache.uniffle</groupId>
@@ -39,7 +44,7 @@
 
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-client</artifactId>
+      <artifactId>${hadoop-client-runtime.artifactId}</artifactId>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
@@ -50,7 +55,7 @@
 
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-minicluster</artifactId>
+      <artifactId>${hadoop-minicluster.artifactId}</artifactId>
       <exclusions>
         <exclusion>
           <groupId>com.sun.jersey</groupId>
diff --git a/tools/client-simulation-yarn/pom.xml b/tools/client-simulation-yarn/pom.xml
index 706f722c62..f1ed3fb87c 100644
--- a/tools/client-simulation-yarn/pom.xml
+++ b/tools/client-simulation-yarn/pom.xml
@@ -59,7 +59,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
+      <artifactId>${hadoop-client-api.artifactId}</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -78,4 +78,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>