diff --git a/build.gradle b/build.gradle
index 8e37eaf6..f9d2db64 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ nexusStaging {
 }
 
 
-def hadoopVersion = "2.10.0"
+def hadoopVersion = "3.2.0"
 ext.playVersion = "2.6.20"
 ext.scalaVersionFull = System.getProperty("scala.binary.version", "2.11.12")
 ext.scalaVersion = scalaVersionFull
diff --git a/tony-core/src/main/java/com/linkedin/tony/HadoopCompatibleAdapter.java b/tony-core/src/main/java/com/linkedin/tony/HadoopCompatibleAdapter.java
index 9fe3d40b..e6b1649b 100644
--- a/tony-core/src/main/java/com/linkedin/tony/HadoopCompatibleAdapter.java
+++ b/tony-core/src/main/java/com/linkedin/tony/HadoopCompatibleAdapter.java
@@ -21,7 +21,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
diff --git a/tony-core/src/main/java/com/linkedin/tony/TonyClient.java b/tony-core/src/main/java/com/linkedin/tony/TonyClient.java
index 209059ef..5e0e08ea 100644
--- a/tony-core/src/main/java/com/linkedin/tony/TonyClient.java
+++ b/tony-core/src/main/java/com/linkedin/tony/TonyClient.java
@@ -53,7 +53,7 @@
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
diff --git a/tony-core/src/main/java/com/linkedin/tony/TonySession.java b/tony-core/src/main/java/com/linkedin/tony/TonySession.java
index bd0cd9d1..9194148e 100644
--- a/tony-core/src/main/java/com/linkedin/tony/TonySession.java
+++ b/tony-core/src/main/java/com/linkedin/tony/TonySession.java
@@ -21,7 +21,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
diff --git a/tony-core/src/main/java/com/linkedin/tony/runtime/HorovodRuntime.java b/tony-core/src/main/java/com/linkedin/tony/runtime/HorovodRuntime.java
index 3907896f..6158ca22 100644
--- a/tony-core/src/main/java/com/linkedin/tony/runtime/HorovodRuntime.java
+++ b/tony-core/src/main/java/com/linkedin/tony/runtime/HorovodRuntime.java
@@ -25,7 +25,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
 
diff --git a/tony-core/src/main/java/com/linkedin/tony/runtime/MLGenericRuntime.java b/tony-core/src/main/java/com/linkedin/tony/runtime/MLGenericRuntime.java
index 226ecdbc..7b613fbe 100644
--- a/tony-core/src/main/java/com/linkedin/tony/runtime/MLGenericRuntime.java
+++ b/tony-core/src/main/java/com/linkedin/tony/runtime/MLGenericRuntime.java
@@ -23,7 +23,7 @@
 import java.util.stream.Collectors;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
diff --git a/tony-core/src/test/java/com/linkedin/tony/TestPortAllocation.java b/tony-core/src/test/java/com/linkedin/tony/TestPortAllocation.java
index 7a19429c..c62a9d7a 100644
--- a/tony-core/src/test/java/com/linkedin/tony/TestPortAllocation.java
+++ b/tony-core/src/test/java/com/linkedin/tony/TestPortAllocation.java
@@ -12,7 +12,7 @@
 import java.io.IOException;
 import java.net.BindException;
 import java.time.Duration;
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.testng.annotations.Test;
 
 public class TestPortAllocation {