This is an automated email from the ASF dual-hosted git repository.

baunsgaard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/systemds.git


The following commit(s) were added to refs/heads/main by this push:
     new e8f5af8734 [MINOR] Remove usage of apache.commons.lang version 2
e8f5af8734 is described below

commit e8f5af8734768a3bb3d3694f4db37bdc8c823474
Author: Mark Dokter <[email protected]>
AuthorDate: Mon Jul 10 16:06:36 2023 +0200

    [MINOR] Remove usage of apache.commons.lang version 2
    
    We use the latest version of apache.commons.lang but don't reflect that
    in the source code. This rather extensive commit replaces all
    occurrences of the old import naming scheme and fixes a few issues where
    functionality was removed or changed in the new version.
    
    Closes #1860
---
 src/main/java/org/apache/sysds/api/DMLScript.java                   | 2 +-
 src/main/java/org/apache/sysds/api/jmlc/PreparedScript.java         | 2 +-
 src/main/java/org/apache/sysds/hops/codegen/cplan/CNodeBinary.java  | 2 +-
 src/main/java/org/apache/sysds/hops/codegen/cplan/CNodeUnary.java   | 4 ++--
 src/main/java/org/apache/sysds/hops/codegen/cplan/cuda/Unary.java   | 2 +-
 src/main/java/org/apache/sysds/hops/codegen/cplan/java/Unary.java   | 2 +-
 .../java/org/apache/sysds/hops/codegen/opt/ReachabilityGraph.java   | 2 +-
 .../java/org/apache/sysds/hops/codegen/template/TemplateUtils.java  | 2 +-
 src/main/java/org/apache/sysds/hops/estim/EstimatorBasicAvg.java    | 2 +-
 src/main/java/org/apache/sysds/hops/estim/EstimatorBasicWorst.java  | 2 +-
 src/main/java/org/apache/sysds/hops/estim/EstimatorBitsetMM.java    | 2 +-
 src/main/java/org/apache/sysds/hops/estim/EstimatorDensityMap.java  | 2 +-
 .../java/org/apache/sysds/hops/estim/EstimatorLayeredGraph.java     | 2 +-
 .../java/org/apache/sysds/hops/estim/EstimatorMatrixHistogram.java  | 4 ++--
 src/main/java/org/apache/sysds/hops/estim/EstimatorSample.java      | 2 +-
 src/main/java/org/apache/sysds/hops/estim/EstimatorSampleRa.java    | 2 +-
 src/main/java/org/apache/sysds/hops/estim/SparsityEstimator.java    | 2 +-
 src/main/java/org/apache/sysds/hops/rewrite/HopRewriteUtils.java    | 2 +-
 .../java/org/apache/sysds/parser/BuiltinFunctionExpression.java     | 4 ++--
 .../org/apache/sysds/runtime/compress/CompressedMatrixBlock.java    | 2 +-
 .../org/apache/sysds/runtime/compress/cocode/CoCodeBinPacking.java  | 2 +-
 .../java/org/apache/sysds/runtime/compress/colgroup/AColGroup.java  | 2 +-
 .../org/apache/sysds/runtime/compress/colgroup/ColGroupDDC.java     | 2 +-
 .../org/apache/sysds/runtime/compress/colgroup/ColGroupDDCFOR.java  | 2 +-
 .../sysds/runtime/compress/colgroup/ColGroupLinearFunctional.java   | 2 +-
 .../org/apache/sysds/runtime/compress/colgroup/ColGroupOLE.java     | 2 +-
 .../org/apache/sysds/runtime/compress/colgroup/ColGroupRLE.java     | 2 +-
 .../org/apache/sysds/runtime/compress/colgroup/ColGroupSDCFOR.java  | 2 +-
 .../sysds/runtime/compress/colgroup/ColGroupSDCSingleZeros.java     | 2 +-
 .../sysds/runtime/compress/colgroup/ColGroupUncompressed.java       | 2 +-
 .../sysds/runtime/compress/colgroup/dictionary/DeltaDictionary.java | 2 +-
 .../runtime/compress/colgroup/dictionary/DictionaryFactory.java     | 2 +-
 .../runtime/compress/colgroup/dictionary/IdentityDictionary.java    | 2 +-
 .../compress/colgroup/dictionary/IdentityDictionarySlice.java       | 2 +-
 .../runtime/compress/colgroup/dictionary/MatrixBlockDictionary.java | 2 +-
 .../sysds/runtime/compress/colgroup/dictionary/QDictionary.java     | 2 +-
 .../apache/sysds/runtime/compress/colgroup/mapping/AMapToData.java  | 2 +-
 .../apache/sysds/runtime/compress/colgroup/mapping/MapToBit.java    | 2 +-
 .../apache/sysds/runtime/compress/colgroup/mapping/MapToByte.java   | 2 +-
 .../apache/sysds/runtime/compress/colgroup/mapping/MapToChar.java   | 2 +-
 .../sysds/runtime/compress/colgroup/mapping/MapToCharPByte.java     | 2 +-
 .../apache/sysds/runtime/compress/colgroup/mapping/MapToInt.java    | 2 +-
 .../apache/sysds/runtime/compress/colgroup/mapping/MapToZero.java   | 2 +-
 .../org/apache/sysds/runtime/compress/colgroup/offset/AOffset.java  | 2 +-
 .../apache/sysds/runtime/compress/colgroup/offset/OffsetSingle.java | 2 +-
 .../apache/sysds/runtime/compress/colgroup/offset/OffsetTwo.java    | 2 +-
 .../apache/sysds/runtime/compress/colgroup/scheme/ConstScheme.java  | 2 +-
 .../apache/sysds/runtime/compress/colgroup/scheme/EmptyScheme.java  | 2 +-
 .../sysds/runtime/compress/colgroup/scheme/SchemeFactory.java       | 2 +-
 .../apache/sysds/runtime/compress/cost/DistinctCostEstimator.java   | 2 +-
 .../org/apache/sysds/runtime/compress/cost/HybridCostEstimator.java | 2 +-
 .../sysds/runtime/compress/estim/CompressedSizeInfoColGroup.java    | 2 +-
 .../sysds/runtime/compress/estim/encoding/EncodingFactory.java      | 2 +-
 .../java/org/apache/sysds/runtime/compress/io/ReaderCompressed.java | 2 +-
 .../org/apache/sysds/runtime/compress/lib/CLALibBinaryCellOp.java   | 2 +-
 .../org/apache/sysds/runtime/compress/lib/CLALibCombineGroups.java  | 2 +-
 .../java/org/apache/sysds/runtime/compress/lib/CLALibCompAgg.java   | 2 +-
 .../java/org/apache/sysds/runtime/compress/lib/CLALibUtils.java     | 2 +-
 src/main/java/org/apache/sysds/runtime/controlprogram/Program.java  | 2 +-
 .../apache/sysds/runtime/controlprogram/caching/CacheableData.java  | 2 +-
 .../apache/sysds/runtime/controlprogram/caching/FrameObject.java    | 4 ++--
 .../apache/sysds/runtime/controlprogram/caching/MatrixObject.java   | 2 +-
 .../apache/sysds/runtime/controlprogram/caching/TensorObject.java   | 2 +-
 .../sysds/runtime/controlprogram/caching/UnifiedMemoryManager.java  | 2 +-
 .../sysds/runtime/controlprogram/federated/FederatedResponse.java   | 4 ++--
 .../runtime/controlprogram/paramserv/FederatedPSControlThread.java  | 2 +-
 .../sysds/runtime/controlprogram/paramserv/NativeHEHelper.java      | 2 +-
 .../apache/sysds/runtime/controlprogram/paramserv/ParamServer.java  | 2 +-
 .../sysds/runtime/controlprogram/paramserv/rpc/PSRpcHandler.java    | 6 +++---
 .../org/apache/sysds/runtime/controlprogram/parfor/opt/OptNode.java | 2 +-
 src/main/java/org/apache/sysds/runtime/data/BasicTensorBlock.java   | 2 +-
 src/main/java/org/apache/sysds/runtime/data/DataTensorBlock.java    | 5 ++---
 .../java/org/apache/sysds/runtime/data/DenseBlockFP64DEDUP.java     | 2 +-
 src/main/java/org/apache/sysds/runtime/data/DenseBlockFactory.java  | 2 +-
 src/main/java/org/apache/sysds/runtime/data/DenseBlockLDRB.java     | 2 +-
 src/main/java/org/apache/sysds/runtime/data/DenseBlockLFP32.java    | 2 +-
 .../java/org/apache/sysds/runtime/data/DenseBlockLFP64DEDUP.java    | 2 +-
 src/main/java/org/apache/sysds/runtime/data/DenseBlockString.java   | 2 +-
 src/main/java/org/apache/sysds/runtime/data/LibTensorAgg.java       | 2 +-
 src/main/java/org/apache/sysds/runtime/data/LibTensorReorg.java     | 2 +-
 src/main/java/org/apache/sysds/runtime/data/TensorBlock.java        | 2 +-
 src/main/java/org/apache/sysds/runtime/frame/data/FrameBlock.java   | 6 +++---
 .../java/org/apache/sysds/runtime/frame/data/columns/Array.java     | 2 +-
 .../org/apache/sysds/runtime/frame/data/columns/OptionalArray.java  | 2 +-
 .../org/apache/sysds/runtime/frame/data/columns/RaggedArray.java    | 2 +-
 .../org/apache/sysds/runtime/frame/data/columns/StringArray.java    | 2 +-
 .../org/apache/sysds/runtime/frame/data/lib/FrameLibAppend.java     | 2 +-
 .../java/org/apache/sysds/runtime/functionobjects/RevIndex.java     | 2 +-
 .../java/org/apache/sysds/runtime/functionobjects/SortIndex.java    | 2 +-
 .../org/apache/sysds/runtime/instructions/InstructionUtils.java     | 2 +-
 .../java/org/apache/sysds/runtime/instructions/cp/CPOperand.java    | 4 ++--
 .../runtime/instructions/cp/MatrixBuiltinNaryCPInstruction.java     | 2 +-
 .../apache/sysds/runtime/instructions/cp/VariableCPInstruction.java | 2 +-
 .../instructions/fed/ParameterizedBuiltinFEDInstruction.java        | 2 +-
 .../apache/sysds/runtime/instructions/fed/UnaryFEDInstruction.java  | 2 +-
 .../instructions/spark/AggregateUnarySketchSPInstruction.java       | 2 +-
 .../sysds/runtime/instructions/spark/QuantilePickSPInstruction.java | 2 +-
 .../apache/sysds/runtime/instructions/spark/WriteSPInstruction.java | 2 +-
 src/main/java/org/apache/sysds/runtime/io/IOUtilFunctions.java      | 2 +-
 src/main/java/org/apache/sysds/runtime/io/ReaderTextCSV.java        | 4 ++--
 .../java/org/apache/sysds/runtime/io/ReaderTextCSVParallel.java     | 2 +-
 src/main/java/org/apache/sysds/runtime/io/ReaderTextLIBSVM.java     | 2 +-
 .../java/org/apache/sysds/runtime/iogen/MatrixGenerateReader.java   | 2 +-
 .../java/org/apache/sysds/runtime/matrix/data/LibMatrixBincell.java | 2 +-
 .../apache/sysds/runtime/matrix/data/LibMatrixCountDistinct.java    | 2 +-
 .../java/org/apache/sysds/runtime/matrix/data/LibMatrixReorg.java   | 2 +-
 .../java/org/apache/sysds/runtime/matrix/data/LibMatrixSketch.java  | 2 +-
 src/main/java/org/apache/sysds/runtime/matrix/data/MatrixBlock.java | 2 +-
 .../sysds/runtime/matrix/data/sketch/MatrixSketchFactory.java       | 2 +-
 .../runtime/matrix/data/sketch/countdistinctapprox/KMVSketch.java   | 2 +-
 .../org/apache/sysds/runtime/transform/decode/DecoderFactory.java   | 2 +-
 .../sysds/runtime/transform/encode/ColumnEncoderComposite.java      | 2 +-
 .../sysds/runtime/transform/encode/ColumnEncoderWordEmbedding.java  | 2 +-
 .../org/apache/sysds/runtime/transform/encode/CompressedEncode.java | 2 +-
 .../org/apache/sysds/runtime/transform/encode/EncoderFactory.java   | 2 +-
 .../org/apache/sysds/runtime/transform/encode/EncoderMVImpute.java  | 2 +-
 .../java/org/apache/sysds/runtime/transform/meta/TfMetaUtils.java   | 2 +-
 src/main/java/org/apache/sysds/runtime/util/CommonThreadPool.java   | 2 +-
 src/main/java/org/apache/sysds/runtime/util/DataConverter.java      | 2 +-
 src/main/java/org/apache/sysds/runtime/util/HDFSTool.java           | 2 +-
 src/main/java/org/apache/sysds/runtime/util/ProgramConverter.java   | 2 +-
 src/main/java/org/apache/sysds/runtime/util/UtilFunctions.java      | 2 +-
 src/main/java/org/apache/sysds/utils/NativeHelper.java              | 2 +-
 src/test/java/org/apache/sysds/test/TestUtils.java                  | 2 +-
 .../sysds/test/component/compress/AbstractCompressedUnaryTests.java | 2 +-
 .../apache/sysds/test/component/compress/CompressedSingleTests.java | 2 +-
 .../apache/sysds/test/component/compress/CompressedTestBase.java    | 2 +-
 .../java/org/apache/sysds/test/component/compress/TestBase.java     | 2 +-
 .../compress/colgroup/ColGroupMorphingPerformanceCompare.java       | 2 +-
 .../apache/sysds/test/component/compress/colgroup/ColGroupTest.java | 2 +-
 .../sysds/test/component/compress/dictionary/CombineTest.java       | 2 +-
 .../test/component/compress/dictionary/DeltaDictionaryTest.java     | 2 +-
 .../test/component/compress/estim/encoding/EncodeNegativeTest.java  | 2 +-
 .../org/apache/sysds/test/component/compress/io/IONegativeTest.java | 2 +-
 .../apache/sysds/test/component/compress/mapping/MappingTests.java  | 2 +-
 .../component/compress/offset/OffsetTestPreAggregateSparse.java     | 2 +-
 .../java/org/apache/sysds/test/component/estim/OpBindChainTest.java | 2 +-
 src/test/java/org/apache/sysds/test/component/estim/OpBindTest.java | 2 +-
 .../org/apache/sysds/test/component/estim/OpElemWChainTest.java     | 2 +-
 .../java/org/apache/sysds/test/component/estim/OpElemWTest.java     | 2 +-
 .../java/org/apache/sysds/test/component/estim/OpSingleTest.java    | 2 +-
 .../apache/sysds/test/component/frame/array/CustomArrayTests.java   | 2 +-
 .../apache/sysds/test/component/frame/array/FrameArrayTests.java    | 2 +-
 .../apache/sysds/test/component/frame/array/NegativeArrayTests.java | 2 +-
 .../sysds/test/component/frame/transform/TransformCustomTest.java   | 2 +-
 .../component/matrix/BinaryOperationInPlaceTestParameterized.java   | 2 +-
 .../org/apache/sysds/test/component/matrix/CountDistinctTest.java   | 2 +-
 .../org/apache/sysds/test/component/misc/MemoryEstimateTest.java    | 2 +-
 .../sysds/test/component/tensor/DenseBlockConstIndexingTest.java    | 2 +-
 .../sysds/test/component/tensor/DenseBlockConstructionTest.java     | 2 +-
 .../sysds/test/component/tensor/DenseBlockCountNonZeroTest.java     | 2 +-
 .../sysds/test/component/tensor/DenseBlockGetSetIndexingTest.java   | 2 +-
 .../apache/sysds/test/component/tensor/DenseBlockIncrementTest.java | 2 +-
 .../sysds/test/component/tensor/DenseBlockSetDenseBlockTest.java    | 2 +-
 .../apache/sysds/test/component/tensor/DenseBlockSetRowTest.java    | 2 +-
 .../apache/sysds/test/functions/builtin/part2/BuiltinMCCTest.java   | 2 +-
 .../apache/sysds/test/functions/builtin/part2/BuiltinMiceTest.java  | 2 +-
 .../sysds/test/functions/builtin/part2/BuiltinNaLocfTest.java       | 2 +-
 .../sysds/test/functions/codegenalg/partone/AlgorithmMSVM.java      | 2 +-
 .../sysds/test/functions/data/misc/MatrixMarketFormatTest.java      | 2 +-
 .../monitoring/FederatedCoordinatorIntegrationCRUDTest.java         | 2 +-
 .../federated/monitoring/FederatedWorkerIntegrationCRUDTest.java    | 2 +-
 .../federated/transform/TransformFederatedEncodeApplyTest.java      | 2 +-
 .../org/apache/sysds/test/functions/jmlc/FrameReadMetaTest.java     | 2 +-
 .../apache/sysds/test/functions/misc/IPAFunctionInliningTest.java   | 2 +-
 165 files changed, 177 insertions(+), 178 deletions(-)

diff --git a/src/main/java/org/apache/sysds/api/DMLScript.java 
b/src/main/java/org/apache/sysds/api/DMLScript.java
index 04b047127e..795da3ea26 100644
--- a/src/main/java/org/apache/sysds/api/DMLScript.java
+++ b/src/main/java/org/apache/sysds/api/DMLScript.java
@@ -38,7 +38,7 @@ import java.util.Scanner;
 
 import org.apache.commons.cli.AlreadySelectedException;
 import org.apache.commons.cli.HelpFormatter;
-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/src/main/java/org/apache/sysds/api/jmlc/PreparedScript.java 
b/src/main/java/org/apache/sysds/api/jmlc/PreparedScript.java
index 45a732e375..08b7425240 100644
--- a/src/main/java/org/apache/sysds/api/jmlc/PreparedScript.java
+++ b/src/main/java/org/apache/sysds/api/jmlc/PreparedScript.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.api.jmlc;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.api.ConfigurableAPI;
diff --git a/src/main/java/org/apache/sysds/hops/codegen/cplan/CNodeBinary.java 
b/src/main/java/org/apache/sysds/hops/codegen/cplan/CNodeBinary.java
index bebf0a221b..ee1ac38df4 100644
--- a/src/main/java/org/apache/sysds/hops/codegen/cplan/CNodeBinary.java
+++ b/src/main/java/org/apache/sysds/hops/codegen/cplan/CNodeBinary.java
@@ -21,7 +21,7 @@ package org.apache.sysds.hops.codegen.cplan;
 
 import java.util.Arrays;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.sysds.hops.codegen.template.TemplateUtils;
 import org.apache.sysds.common.Types.DataType;
 import org.apache.sysds.runtime.util.UtilFunctions;
diff --git a/src/main/java/org/apache/sysds/hops/codegen/cplan/CNodeUnary.java 
b/src/main/java/org/apache/sysds/hops/codegen/cplan/CNodeUnary.java
index 6ec252a499..b3c089eeda 100644
--- a/src/main/java/org/apache/sysds/hops/codegen/cplan/CNodeUnary.java
+++ b/src/main/java/org/apache/sysds/hops/codegen/cplan/CNodeUnary.java
@@ -21,8 +21,8 @@ package org.apache.sysds.hops.codegen.cplan;
 
 import java.util.Arrays;
 
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.sysds.common.Types.DataType;
 import org.apache.sysds.runtime.util.UtilFunctions;
 import org.apache.sysds.hops.codegen.SpoofCompiler.GeneratorAPI;
diff --git a/src/main/java/org/apache/sysds/hops/codegen/cplan/cuda/Unary.java 
b/src/main/java/org/apache/sysds/hops/codegen/cplan/cuda/Unary.java
index 405b880715..7aad7a1592 100644
--- a/src/main/java/org/apache/sysds/hops/codegen/cplan/cuda/Unary.java
+++ b/src/main/java/org/apache/sysds/hops/codegen/cplan/cuda/Unary.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.hops.codegen.cplan.cuda;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.sysds.hops.codegen.cplan.CNodeUnary;
 import org.apache.sysds.hops.codegen.cplan.CodeTemplate;
 
diff --git a/src/main/java/org/apache/sysds/hops/codegen/cplan/java/Unary.java 
b/src/main/java/org/apache/sysds/hops/codegen/cplan/java/Unary.java
index 43f1b5dc63..50ea2bace8 100644
--- a/src/main/java/org/apache/sysds/hops/codegen/cplan/java/Unary.java
+++ b/src/main/java/org/apache/sysds/hops/codegen/cplan/java/Unary.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.hops.codegen.cplan.java;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.sysds.hops.codegen.cplan.CNodeUnary.UnaryType;
 import org.apache.sysds.hops.codegen.cplan.CodeTemplate;
 
diff --git 
a/src/main/java/org/apache/sysds/hops/codegen/opt/ReachabilityGraph.java 
b/src/main/java/org/apache/sysds/hops/codegen/opt/ReachabilityGraph.java
index e62b98c3a0..a0012f1bb6 100644
--- a/src/main/java/org/apache/sysds/hops/codegen/opt/ReachabilityGraph.java
+++ b/src/main/java/org/apache/sysds/hops/codegen/opt/ReachabilityGraph.java
@@ -27,7 +27,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.sysds.hops.Hop;
 import org.apache.sysds.hops.codegen.opt.PlanSelection.VisitMarkCost;
diff --git 
a/src/main/java/org/apache/sysds/hops/codegen/template/TemplateUtils.java 
b/src/main/java/org/apache/sysds/hops/codegen/template/TemplateUtils.java
index 8a4e0f62c9..5a4a7ac62a 100644
--- a/src/main/java/org/apache/sysds/hops/codegen/template/TemplateUtils.java
+++ b/src/main/java/org/apache/sysds/hops/codegen/template/TemplateUtils.java
@@ -26,7 +26,7 @@ import java.util.LinkedList;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.mutable.MutableInt;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.sysds.hops.AggBinaryOp;
diff --git a/src/main/java/org/apache/sysds/hops/estim/EstimatorBasicAvg.java 
b/src/main/java/org/apache/sysds/hops/estim/EstimatorBasicAvg.java
index 0a45da0bab..4b30e793c6 100644
--- a/src/main/java/org/apache/sysds/hops/estim/EstimatorBasicAvg.java
+++ b/src/main/java/org/apache/sysds/hops/estim/EstimatorBasicAvg.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.hops.estim;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.hops.OptimizerUtils;
 import org.apache.sysds.runtime.matrix.data.MatrixBlock;
 import org.apache.sysds.runtime.meta.DataCharacteristics;
diff --git a/src/main/java/org/apache/sysds/hops/estim/EstimatorBasicWorst.java 
b/src/main/java/org/apache/sysds/hops/estim/EstimatorBasicWorst.java
index 97aa57fa5c..af7ed98718 100644
--- a/src/main/java/org/apache/sysds/hops/estim/EstimatorBasicWorst.java
+++ b/src/main/java/org/apache/sysds/hops/estim/EstimatorBasicWorst.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.hops.estim;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.hops.OptimizerUtils;
 import org.apache.sysds.runtime.matrix.data.MatrixBlock;
 import org.apache.sysds.runtime.meta.DataCharacteristics;
diff --git a/src/main/java/org/apache/sysds/hops/estim/EstimatorBitsetMM.java 
b/src/main/java/org/apache/sysds/hops/estim/EstimatorBitsetMM.java
index 6ba05a9797..b7422a034b 100644
--- a/src/main/java/org/apache/sysds/hops/estim/EstimatorBitsetMM.java
+++ b/src/main/java/org/apache/sysds/hops/estim/EstimatorBitsetMM.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.hops.estim;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.hops.HopsException;
 import org.apache.sysds.hops.OptimizerUtils;
 import 
org.apache.sysds.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
diff --git a/src/main/java/org/apache/sysds/hops/estim/EstimatorDensityMap.java 
b/src/main/java/org/apache/sysds/hops/estim/EstimatorDensityMap.java
index 65a84636a1..c7969de06f 100644
--- a/src/main/java/org/apache/sysds/hops/estim/EstimatorDensityMap.java
+++ b/src/main/java/org/apache/sysds/hops/estim/EstimatorDensityMap.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.hops.estim;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.hops.OptimizerUtils;
 import org.apache.sysds.runtime.data.DenseBlock;
 import org.apache.sysds.runtime.data.SparseBlock;
diff --git 
a/src/main/java/org/apache/sysds/hops/estim/EstimatorLayeredGraph.java 
b/src/main/java/org/apache/sysds/hops/estim/EstimatorLayeredGraph.java
index beafb9f81a..cc636c6a91 100644
--- a/src/main/java/org/apache/sysds/hops/estim/EstimatorLayeredGraph.java
+++ b/src/main/java/org/apache/sysds/hops/estim/EstimatorLayeredGraph.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.hops.estim;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.math3.distribution.ExponentialDistribution;
 import org.apache.commons.math3.random.Well1024a;
 import org.apache.sysds.hops.OptimizerUtils;
diff --git 
a/src/main/java/org/apache/sysds/hops/estim/EstimatorMatrixHistogram.java 
b/src/main/java/org/apache/sysds/hops/estim/EstimatorMatrixHistogram.java
index 26c442deee..9bfecabaea 100644
--- a/src/main/java/org/apache/sysds/hops/estim/EstimatorMatrixHistogram.java
+++ b/src/main/java/org/apache/sysds/hops/estim/EstimatorMatrixHistogram.java
@@ -19,8 +19,8 @@
 
 package org.apache.sysds.hops.estim;
 
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.hops.OptimizerUtils;
 import org.apache.sysds.runtime.data.DenseBlock;
 import org.apache.sysds.runtime.data.SparseBlock;
diff --git a/src/main/java/org/apache/sysds/hops/estim/EstimatorSample.java 
b/src/main/java/org/apache/sysds/hops/estim/EstimatorSample.java
index 366fe92c49..ec269cd97f 100644
--- a/src/main/java/org/apache/sysds/hops/estim/EstimatorSample.java
+++ b/src/main/java/org/apache/sysds/hops/estim/EstimatorSample.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.hops.estim;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.hops.OptimizerUtils;
 import org.apache.sysds.runtime.DMLRuntimeException;
 import org.apache.sysds.runtime.data.DenseBlock;
diff --git a/src/main/java/org/apache/sysds/hops/estim/EstimatorSampleRa.java 
b/src/main/java/org/apache/sysds/hops/estim/EstimatorSampleRa.java
index 4086b05b2b..fbe0bc5652 100644
--- a/src/main/java/org/apache/sysds/hops/estim/EstimatorSampleRa.java
+++ b/src/main/java/org/apache/sysds/hops/estim/EstimatorSampleRa.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.hops.estim;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.math3.random.Well1024a;
 import org.apache.sysds.hops.OptimizerUtils;
 import org.apache.sysds.runtime.DMLRuntimeException;
diff --git a/src/main/java/org/apache/sysds/hops/estim/SparsityEstimator.java 
b/src/main/java/org/apache/sysds/hops/estim/SparsityEstimator.java
index af4a2893ae..6c106d7ccf 100644
--- a/src/main/java/org/apache/sysds/hops/estim/SparsityEstimator.java
+++ b/src/main/java/org/apache/sysds/hops/estim/SparsityEstimator.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.hops.estim;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.hops.HopsException;
diff --git a/src/main/java/org/apache/sysds/hops/rewrite/HopRewriteUtils.java 
b/src/main/java/org/apache/sysds/hops/rewrite/HopRewriteUtils.java
index 338393eda5..8d418ab171 100644
--- a/src/main/java/org/apache/sysds/hops/rewrite/HopRewriteUtils.java
+++ b/src/main/java/org/apache/sysds/hops/rewrite/HopRewriteUtils.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.hops.rewrite;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.api.DMLScript;
diff --git 
a/src/main/java/org/apache/sysds/parser/BuiltinFunctionExpression.java 
b/src/main/java/org/apache/sysds/parser/BuiltinFunctionExpression.java
index 80e9f75b80..dd9bfe7892 100644
--- a/src/main/java/org/apache/sysds/parser/BuiltinFunctionExpression.java
+++ b/src/main/java/org/apache/sysds/parser/BuiltinFunctionExpression.java
@@ -25,8 +25,8 @@ import java.util.HashMap;
 import java.util.HashSet;
 
 import org.antlr.v4.runtime.ParserRuleContext;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.common.Builtins;
 import org.apache.sysds.common.Types.DataType;
 import org.apache.sysds.common.Types.ValueType;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/CompressedMatrixBlock.java 
b/src/main/java/org/apache/sysds/runtime/compress/CompressedMatrixBlock.java
index c31fd6929a..7ec6474916 100644
--- a/src/main/java/org/apache/sysds/runtime/compress/CompressedMatrixBlock.java
+++ b/src/main/java/org/apache/sysds/runtime/compress/CompressedMatrixBlock.java
@@ -30,7 +30,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.Future;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.math3.random.Well1024a;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/cocode/CoCodeBinPacking.java 
b/src/main/java/org/apache/sysds/runtime/compress/cocode/CoCodeBinPacking.java
index dc5998c52f..31e0fe16f2 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/cocode/CoCodeBinPacking.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/cocode/CoCodeBinPacking.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.compress.cocode;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.CompressionSettings;
 import org.apache.sysds.runtime.compress.cost.ACostEstimate;
 import org.apache.sysds.runtime.compress.estim.AComEst;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/AColGroup.java 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/AColGroup.java
index e85b220d4b..8c9697cc00 100644
--- a/src/main/java/org/apache/sysds/runtime/compress/colgroup/AColGroup.java
+++ b/src/main/java/org/apache/sysds/runtime/compress/colgroup/AColGroup.java
@@ -24,7 +24,7 @@ import java.io.IOException;
 import java.io.Serializable;
 import java.util.Collection;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.runtime.compress.colgroup.indexes.IColIndex;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupDDC.java 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupDDC.java
index 78a0bdba51..49e234a293 100644
--- a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupDDC.java
+++ b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupDDC.java
@@ -24,7 +24,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.util.Arrays;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.colgroup.dictionary.ADictionary;
 import org.apache.sysds.runtime.compress.colgroup.dictionary.Dictionary;
 import org.apache.sysds.runtime.compress.colgroup.dictionary.DictionaryFactory;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupDDCFOR.java 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupDDCFOR.java
index c1f99d0202..b527b223b2 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupDDCFOR.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupDDCFOR.java
@@ -24,7 +24,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.util.Arrays;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.DMLRuntimeException;
 import org.apache.sysds.runtime.compress.colgroup.dictionary.ADictionary;
 import org.apache.sysds.runtime.compress.colgroup.dictionary.DictionaryFactory;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupLinearFunctional.java
 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupLinearFunctional.java
index 6e24eec583..e55baf5718 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupLinearFunctional.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupLinearFunctional.java
@@ -24,7 +24,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.util.Arrays;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.DMLCompressionException;
 import org.apache.sysds.runtime.compress.colgroup.indexes.ColIndexFactory;
 import org.apache.sysds.runtime.compress.colgroup.indexes.IColIndex;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupOLE.java 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupOLE.java
index cf958fd273..bac40cb687 100644
--- a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupOLE.java
+++ b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupOLE.java
@@ -23,7 +23,7 @@ import java.io.DataInput;
 import java.io.IOException;
 import java.util.Arrays;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.CompressionSettings;
 import org.apache.sysds.runtime.compress.bitmap.ABitmap;
 import org.apache.sysds.runtime.compress.colgroup.dictionary.ADictionary;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupRLE.java 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupRLE.java
index ea08baacfd..17faf24511 100644
--- a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupRLE.java
+++ b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupRLE.java
@@ -25,7 +25,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.bitmap.ABitmap;
 import org.apache.sysds.runtime.compress.colgroup.dictionary.ADictionary;
 import org.apache.sysds.runtime.compress.colgroup.dictionary.Dictionary;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCFOR.java 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCFOR.java
index d2e7b549d8..a16e0d4a6f 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCFOR.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCFOR.java
@@ -24,7 +24,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.util.Arrays;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.DMLCompressionException;
 import org.apache.sysds.runtime.compress.colgroup.dictionary.ADictionary;
 import org.apache.sysds.runtime.compress.colgroup.dictionary.Dictionary;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCSingleZeros.java
 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCSingleZeros.java
index 8a90b2abf0..9392b1f23f 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCSingleZeros.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCSingleZeros.java
@@ -24,7 +24,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.util.Arrays;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.DMLCompressionException;
 import org.apache.sysds.runtime.compress.colgroup.dictionary.ADictionary;
 import org.apache.sysds.runtime.compress.colgroup.dictionary.Dictionary;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupUncompressed.java
 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupUncompressed.java
index ffa9656f54..3bbbc5fcc3 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupUncompressed.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupUncompressed.java
@@ -25,7 +25,7 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.DMLRuntimeException;
 import org.apache.sysds.runtime.compress.CompressedMatrixBlock;
 import org.apache.sysds.runtime.compress.CompressedMatrixBlockFactory;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/DeltaDictionary.java
 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/DeltaDictionary.java
index ba38772353..a990b689b9 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/DeltaDictionary.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/DeltaDictionary.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.compress.colgroup.dictionary;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.functionobjects.Divide;
 import org.apache.sysds.runtime.functionobjects.Minus;
 import org.apache.sysds.runtime.functionobjects.Multiply;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/DictionaryFactory.java
 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/DictionaryFactory.java
index 37ed289862..806ac9ab53 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/DictionaryFactory.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/DictionaryFactory.java
@@ -24,7 +24,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Map;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.runtime.compress.DMLCompressionException;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/IdentityDictionary.java
 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/IdentityDictionary.java
index b46db73c1c..8214caf5c7 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/IdentityDictionary.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/IdentityDictionary.java
@@ -25,7 +25,7 @@ import java.io.IOException;
 import java.lang.ref.SoftReference;
 import java.util.Arrays;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.DMLCompressionException;
 import org.apache.sysds.runtime.compress.colgroup.indexes.IColIndex;
 import org.apache.sysds.runtime.data.SparseBlock;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/IdentityDictionarySlice.java
 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/IdentityDictionarySlice.java
index 55315b3451..3be3bd16a0 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/IdentityDictionarySlice.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/IdentityDictionarySlice.java
@@ -25,7 +25,7 @@ import java.io.IOException;
 import java.lang.ref.SoftReference;
 import java.util.Arrays;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.DMLRuntimeException;
 import org.apache.sysds.runtime.compress.colgroup.indexes.IColIndex;
 import org.apache.sysds.runtime.functionobjects.Builtin;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/MatrixBlockDictionary.java
 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/MatrixBlockDictionary.java
index fb851905e8..48d0b62dd5 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/MatrixBlockDictionary.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/MatrixBlockDictionary.java
@@ -26,7 +26,7 @@ import java.math.BigDecimal;
 import java.math.MathContext;
 import java.util.Arrays;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.DMLCompressionException;
 import org.apache.sysds.runtime.compress.colgroup.indexes.IColIndex;
 import org.apache.sysds.runtime.compress.utils.Util;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/QDictionary.java
 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/QDictionary.java
index ad91e1403e..a6a82ce606 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/QDictionary.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/dictionary/QDictionary.java
@@ -23,7 +23,7 @@ import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.colgroup.indexes.IColIndex;
 import org.apache.sysds.runtime.data.SparseBlock;
 import org.apache.sysds.runtime.functionobjects.Builtin;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/AMapToData.java
 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/AMapToData.java
index 65fc1b22b2..6c41f68259 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/AMapToData.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/AMapToData.java
@@ -24,7 +24,7 @@ import java.io.IOException;
 import java.io.Serializable;
 import java.util.BitSet;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.runtime.compress.colgroup.IMapToDataGroup;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToBit.java
 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToBit.java
index 77084ff0b7..55152efdf8 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToBit.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToBit.java
@@ -24,7 +24,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.util.BitSet;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.DMLRuntimeException;
 import org.apache.sysds.runtime.compress.colgroup.IMapToDataGroup;
 import org.apache.sysds.runtime.compress.colgroup.dictionary.ADictionary;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToByte.java
 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToByte.java
index 184f7746d7..1a7907e5f8 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToByte.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToByte.java
@@ -25,7 +25,7 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.BitSet;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.colgroup.IMapToDataGroup;
 import 
org.apache.sysds.runtime.compress.colgroup.mapping.MapToFactory.MAP_TYPE;
 import org.apache.sysds.utils.MemoryEstimates;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToChar.java
 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToChar.java
index 6c1fc6d030..c7dd5182a7 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToChar.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToChar.java
@@ -25,7 +25,7 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.BitSet;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.colgroup.IMapToDataGroup;
 import 
org.apache.sysds.runtime.compress.colgroup.mapping.MapToFactory.MAP_TYPE;
 import org.apache.sysds.utils.MemoryEstimates;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToCharPByte.java
 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToCharPByte.java
index f78a21149f..e76aafed69 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToCharPByte.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToCharPByte.java
@@ -25,7 +25,7 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.BitSet;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.colgroup.IMapToDataGroup;
 import 
org.apache.sysds.runtime.compress.colgroup.mapping.MapToFactory.MAP_TYPE;
 import org.apache.sysds.utils.MemoryEstimates;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToInt.java
 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToInt.java
index 88e46af3fa..acad7ee460 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToInt.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToInt.java
@@ -25,7 +25,7 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.BitSet;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.colgroup.IMapToDataGroup;
 import 
org.apache.sysds.runtime.compress.colgroup.mapping.MapToFactory.MAP_TYPE;
 import org.apache.sysds.utils.MemoryEstimates;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToZero.java
 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToZero.java
index cb53197d38..bdc13b3bac 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToZero.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToZero.java
@@ -24,7 +24,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.util.BitSet;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.colgroup.IMapToDataGroup;
 import org.apache.sysds.runtime.compress.colgroup.dictionary.ADictionary;
 import 
org.apache.sysds.runtime.compress.colgroup.mapping.MapToFactory.MAP_TYPE;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/offset/AOffset.java 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/offset/AOffset.java
index c17c761ccc..9feb7bb708 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/offset/AOffset.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/offset/AOffset.java
@@ -24,7 +24,7 @@ import java.io.Serializable;
 import java.lang.ref.SoftReference;
 import java.util.Arrays;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.runtime.DMLRuntimeException;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/offset/OffsetSingle.java
 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/offset/OffsetSingle.java
index a206563319..0c88d98096 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/offset/OffsetSingle.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/offset/OffsetSingle.java
@@ -23,7 +23,7 @@ import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 
 public class OffsetSingle extends AOffset {
        private static final long serialVersionUID = -614636669776415032L;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/offset/OffsetTwo.java
 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/offset/OffsetTwo.java
index 29fc4b40b8..370dbc4e44 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/offset/OffsetTwo.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/offset/OffsetTwo.java
@@ -23,7 +23,7 @@ import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.DMLCompressionException;
 
 public class OffsetTwo extends AOffset {
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/scheme/ConstScheme.java
 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/scheme/ConstScheme.java
index b2ec96296d..3f96e78371 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/scheme/ConstScheme.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/scheme/ConstScheme.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.compress.colgroup.scheme;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.colgroup.AColGroup;
 import org.apache.sysds.runtime.compress.colgroup.ColGroupConst;
 import org.apache.sysds.runtime.compress.colgroup.indexes.IColIndex;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/scheme/EmptyScheme.java
 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/scheme/EmptyScheme.java
index 5015b54001..4e27906b91 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/scheme/EmptyScheme.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/scheme/EmptyScheme.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.compress.colgroup.scheme;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.colgroup.AColGroup;
 import org.apache.sysds.runtime.compress.colgroup.ColGroupEmpty;
 import org.apache.sysds.runtime.compress.colgroup.indexes.IColIndex;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/scheme/SchemeFactory.java
 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/scheme/SchemeFactory.java
index 9e98818714..ebdfab0a0b 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/scheme/SchemeFactory.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/scheme/SchemeFactory.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.compress.colgroup.scheme;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.colgroup.AColGroup.CompressionType;
 import org.apache.sysds.runtime.compress.colgroup.indexes.IColIndex;
 
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/cost/DistinctCostEstimator.java
 
b/src/main/java/org/apache/sysds/runtime/compress/cost/DistinctCostEstimator.java
index 0de6195169..ca6a93d617 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/cost/DistinctCostEstimator.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/cost/DistinctCostEstimator.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.compress.cost;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.CompressionSettings;
 import org.apache.sysds.runtime.compress.colgroup.AColGroup;
 import org.apache.sysds.runtime.compress.estim.CompressedSizeInfoColGroup;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/cost/HybridCostEstimator.java 
b/src/main/java/org/apache/sysds/runtime/compress/cost/HybridCostEstimator.java
index 0b2aada630..bed7712770 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/cost/HybridCostEstimator.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/cost/HybridCostEstimator.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.compress.cost;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.colgroup.AColGroup;
 import org.apache.sysds.runtime.compress.estim.CompressedSizeInfoColGroup;
 import org.apache.sysds.runtime.matrix.data.MatrixBlock;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/estim/CompressedSizeInfoColGroup.java
 
b/src/main/java/org/apache/sysds/runtime/compress/estim/CompressedSizeInfoColGroup.java
index b9a1f2482a..a3818fa333 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/estim/CompressedSizeInfoColGroup.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/estim/CompressedSizeInfoColGroup.java
@@ -23,7 +23,7 @@ import java.util.EnumMap;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.runtime.compress.CompressionSettings;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/estim/encoding/EncodingFactory.java
 
b/src/main/java/org/apache/sysds/runtime/compress/estim/encoding/EncodingFactory.java
index 05b21d2c11..c5a17791d5 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/estim/encoding/EncodingFactory.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/estim/encoding/EncodingFactory.java
@@ -21,7 +21,7 @@ package org.apache.sysds.runtime.compress.estim.encoding;
 
 import java.util.Arrays;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.runtime.compress.colgroup.ColGroupConst;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/io/ReaderCompressed.java 
b/src/main/java/org/apache/sysds/runtime/compress/io/ReaderCompressed.java
index c3493df65d..f30c01aa84 100644
--- a/src/main/java/org/apache/sysds/runtime/compress/io/ReaderCompressed.java
+++ b/src/main/java/org/apache/sysds/runtime/compress/io/ReaderCompressed.java
@@ -24,7 +24,7 @@ import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.SequenceFile;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibBinaryCellOp.java 
b/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibBinaryCellOp.java
index 54bd51e60f..94487ea4ab 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibBinaryCellOp.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibBinaryCellOp.java
@@ -26,7 +26,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.runtime.DMLRuntimeException;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibCombineGroups.java 
b/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibCombineGroups.java
index 3d112a57b0..849dafa51e 100644
--- 
a/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibCombineGroups.java
+++ 
b/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibCombineGroups.java
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibCompAgg.java 
b/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibCompAgg.java
index d12abb1167..0e592671fb 100644
--- a/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibCompAgg.java
+++ b/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibCompAgg.java
@@ -27,7 +27,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.api.DMLScript;
diff --git 
a/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibUtils.java 
b/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibUtils.java
index 20262e7437..eba4bcc678 100644
--- a/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibUtils.java
+++ b/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibUtils.java
@@ -24,7 +24,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.runtime.compress.CompressedMatrixBlock;
diff --git a/src/main/java/org/apache/sysds/runtime/controlprogram/Program.java 
b/src/main/java/org/apache/sysds/runtime/controlprogram/Program.java
index 806f89318a..73ed572114 100644
--- a/src/main/java/org/apache/sysds/runtime/controlprogram/Program.java
+++ b/src/main/java/org/apache/sysds/runtime/controlprogram/Program.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map.Entry;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.parser.DMLProgram;
 import org.apache.sysds.parser.FunctionDictionary;
 import org.apache.sysds.runtime.DMLRuntimeException;
diff --git 
a/src/main/java/org/apache/sysds/runtime/controlprogram/caching/CacheableData.java
 
b/src/main/java/org/apache/sysds/runtime/controlprogram/caching/CacheableData.java
index 6fd2c605ed..5f7f638d3f 100644
--- 
a/src/main/java/org/apache/sysds/runtime/controlprogram/caching/CacheableData.java
+++ 
b/src/main/java/org/apache/sysds/runtime/controlprogram/caching/CacheableData.java
@@ -26,7 +26,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.commons.lang.mutable.MutableBoolean;
+import org.apache.commons.lang3.mutable.MutableBoolean;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.fs.Path;
diff --git 
a/src/main/java/org/apache/sysds/runtime/controlprogram/caching/FrameObject.java
 
b/src/main/java/org/apache/sysds/runtime/controlprogram/caching/FrameObject.java
index cf745af50a..df1811e42e 100644
--- 
a/src/main/java/org/apache/sysds/runtime/controlprogram/caching/FrameObject.java
+++ 
b/src/main/java/org/apache/sysds/runtime/controlprogram/caching/FrameObject.java
@@ -20,8 +20,8 @@
 package org.apache.sysds.runtime.controlprogram.caching;
 
 
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.mutable.MutableBoolean;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.mutable.MutableBoolean;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.sysds.common.Types.DataType;
 import org.apache.sysds.common.Types.FileFormat;
diff --git 
a/src/main/java/org/apache/sysds/runtime/controlprogram/caching/MatrixObject.java
 
b/src/main/java/org/apache/sysds/runtime/controlprogram/caching/MatrixObject.java
index 6106bb14e1..63e632c895 100644
--- 
a/src/main/java/org/apache/sysds/runtime/controlprogram/caching/MatrixObject.java
+++ 
b/src/main/java/org/apache/sysds/runtime/controlprogram/caching/MatrixObject.java
@@ -24,7 +24,7 @@ import java.lang.ref.SoftReference;
 import java.util.List;
 import java.util.concurrent.Future;
 
-import org.apache.commons.lang.mutable.MutableBoolean;
+import org.apache.commons.lang3.mutable.MutableBoolean;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.sysds.api.DMLScript;
 import org.apache.sysds.common.Types.DataType;
diff --git 
a/src/main/java/org/apache/sysds/runtime/controlprogram/caching/TensorObject.java
 
b/src/main/java/org/apache/sysds/runtime/controlprogram/caching/TensorObject.java
index 248f3fc226..13665f65a2 100644
--- 
a/src/main/java/org/apache/sysds/runtime/controlprogram/caching/TensorObject.java
+++ 
b/src/main/java/org/apache/sysds/runtime/controlprogram/caching/TensorObject.java
@@ -20,7 +20,7 @@
 package org.apache.sysds.runtime.controlprogram.caching;
 
 
-import org.apache.commons.lang.mutable.MutableBoolean;
+import org.apache.commons.lang3.mutable.MutableBoolean;
 import org.apache.spark.api.java.JavaPairRDD;
 import org.apache.sysds.api.DMLScript;
 import org.apache.sysds.common.Types.DataType;
diff --git 
a/src/main/java/org/apache/sysds/runtime/controlprogram/caching/UnifiedMemoryManager.java
 
b/src/main/java/org/apache/sysds/runtime/controlprogram/caching/UnifiedMemoryManager.java
index e9af113d01..f8e3e600f8 100644
--- 
a/src/main/java/org/apache/sysds/runtime/controlprogram/caching/UnifiedMemoryManager.java
+++ 
b/src/main/java/org/apache/sysds/runtime/controlprogram/caching/UnifiedMemoryManager.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.controlprogram.caching;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.api.DMLScript;
 import org.apache.sysds.hops.OptimizerUtils;
 import org.apache.sysds.runtime.DMLRuntimeException;
diff --git 
a/src/main/java/org/apache/sysds/runtime/controlprogram/federated/FederatedResponse.java
 
b/src/main/java/org/apache/sysds/runtime/controlprogram/federated/FederatedResponse.java
index e2409bce77..89c98377bb 100644
--- 
a/src/main/java/org/apache/sysds/runtime/controlprogram/federated/FederatedResponse.java
+++ 
b/src/main/java/org/apache/sysds/runtime/controlprogram/federated/FederatedResponse.java
@@ -24,7 +24,7 @@ import java.util.EnumMap;
 import java.util.Map;
 import java.util.concurrent.atomic.LongAdder;
 
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.sysds.runtime.controlprogram.caching.CacheBlock;
 import org.apache.sysds.runtime.DMLRuntimeException;
 import org.apache.sysds.runtime.lineage.LineageItem;
@@ -80,7 +80,7 @@ public class FederatedResponse implements Serializable {
        
        public String getErrorMessage() {
                if (_data[0] instanceof Throwable )
-                       return ExceptionUtils.getFullStackTrace( (Throwable) 
_data[0] );
+                       return ExceptionUtils.getStackTrace( (Throwable) 
_data[0] );
                else if (_data[0] instanceof String)
                        return (String) _data[0];
                else return "No readable error message";
diff --git 
a/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/FederatedPSControlThread.java
 
b/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/FederatedPSControlThread.java
index 09fd0a3349..642b08f51a 100644
--- 
a/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/FederatedPSControlThread.java
+++ 
b/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/FederatedPSControlThread.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.controlprogram.paramserv;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git 
a/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/NativeHEHelper.java
 
b/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/NativeHEHelper.java
index b2874fa908..e4ee25eb03 100644
--- 
a/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/NativeHEHelper.java
+++ 
b/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/NativeHEHelper.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.controlprogram.paramserv;
 
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.apache.sysds.utils.NativeHelper;
 
 public class NativeHEHelper {
diff --git 
a/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/ParamServer.java
 
b/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/ParamServer.java
index e88a19d964..0305156255 100644
--- 
a/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/ParamServer.java
+++ 
b/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/ParamServer.java
@@ -25,7 +25,7 @@ import java.util.concurrent.BlockingQueue;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git 
a/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/rpc/PSRpcHandler.java
 
b/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/rpc/PSRpcHandler.java
index 2e1876343e..186d530ff9 100644
--- 
a/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/rpc/PSRpcHandler.java
+++ 
b/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/rpc/PSRpcHandler.java
@@ -25,7 +25,7 @@ import static 
org.apache.sysds.runtime.controlprogram.paramserv.rpc.PSRpcCall.PU
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.spark.network.client.RpcResponseCallback;
 import org.apache.spark.network.client.TransportClient;
 import org.apache.spark.network.server.OneForOneStreamManager;
@@ -59,7 +59,7 @@ public final class PSRpcHandler extends RpcHandler {
                                        _server.push(call.getWorkerID(), 
call.getData());
                                        response = new 
PSRpcResponse(Type.SUCCESS_EMPTY);
                                } catch (DMLRuntimeException exception) {
-                                       response = new 
PSRpcResponse(Type.ERROR, ExceptionUtils.getFullStackTrace(exception));
+                                       response = new 
PSRpcResponse(Type.ERROR, ExceptionUtils.getStackTrace(exception));
                                } finally {
                                        try {
                                                
callback.onSuccess(response.serialize());
@@ -74,7 +74,7 @@ public final class PSRpcHandler extends RpcHandler {
                                        data = _server.pull(call.getWorkerID());
                                        response = new 
PSRpcResponse(Type.SUCCESS, data);
                                } catch (DMLRuntimeException exception) {
-                                       response = new 
PSRpcResponse(Type.ERROR, ExceptionUtils.getFullStackTrace(exception));
+                                       response = new 
PSRpcResponse(Type.ERROR, ExceptionUtils.getStackTrace(exception));
                                } finally {
                                        try {
                                                
callback.onSuccess(response.serialize());
diff --git 
a/src/main/java/org/apache/sysds/runtime/controlprogram/parfor/opt/OptNode.java 
b/src/main/java/org/apache/sysds/runtime/controlprogram/parfor/opt/OptNode.java
index 3a73274755..f195721f31 100644
--- 
a/src/main/java/org/apache/sysds/runtime/controlprogram/parfor/opt/OptNode.java
+++ 
b/src/main/java/org/apache/sysds/runtime/controlprogram/parfor/opt/OptNode.java
@@ -25,7 +25,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Set;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.sysds.lops.Lop;
 import org.apache.sysds.runtime.controlprogram.ParForProgramBlock;
 import 
org.apache.sysds.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
diff --git a/src/main/java/org/apache/sysds/runtime/data/BasicTensorBlock.java 
b/src/main/java/org/apache/sysds/runtime/data/BasicTensorBlock.java
index 3710f72331..4a623d17b7 100644
--- a/src/main/java/org/apache/sysds/runtime/data/BasicTensorBlock.java
+++ b/src/main/java/org/apache/sysds/runtime/data/BasicTensorBlock.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.data;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.common.Types.ValueType;
 import org.apache.sysds.runtime.DMLRuntimeException;
 import org.apache.sysds.runtime.functionobjects.KahanPlus;
diff --git a/src/main/java/org/apache/sysds/runtime/data/DataTensorBlock.java 
b/src/main/java/org/apache/sysds/runtime/data/DataTensorBlock.java
index c0ebafe1d5..1a9a4f4885 100644
--- a/src/main/java/org/apache/sysds/runtime/data/DataTensorBlock.java
+++ b/src/main/java/org/apache/sysds/runtime/data/DataTensorBlock.java
@@ -19,7 +19,6 @@
 
 package org.apache.sysds.runtime.data;
 
-import org.apache.commons.lang.math.IntRange;
 import org.apache.sysds.common.Types.ValueType;
 import org.apache.sysds.runtime.DMLRuntimeException;
 
@@ -99,9 +98,9 @@ public class DataTensorBlock implements Serializable {
                _dims = dims;
                _schema = new ValueType[getDim(1)];
                Arrays.fill(_schema, vt);
-               _colsToIx = new IntRange(0, getDim(1)).toArray();
+               _colsToIx = IntStream.range(0, getDim(1)).toArray();
                _ixToCols = new int[VALID_VALUE_TYPES_LENGTH][];
-               _ixToCols[vt.ordinal()] = new IntRange(0, getDim(1)).toArray();
+               _ixToCols[vt.ordinal()] = IntStream.range(0, 
getDim(1)).toArray();
                reset();
        }
 
diff --git 
a/src/main/java/org/apache/sysds/runtime/data/DenseBlockFP64DEDUP.java 
b/src/main/java/org/apache/sysds/runtime/data/DenseBlockFP64DEDUP.java
index 40eb4c5018..4b4ba218c8 100644
--- a/src/main/java/org/apache/sysds/runtime/data/DenseBlockFP64DEDUP.java
+++ b/src/main/java/org/apache/sysds/runtime/data/DenseBlockFP64DEDUP.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.data;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.common.Types;
 import org.apache.sysds.runtime.util.UtilFunctions;
 
diff --git a/src/main/java/org/apache/sysds/runtime/data/DenseBlockFactory.java 
b/src/main/java/org/apache/sysds/runtime/data/DenseBlockFactory.java
index c48a9d0aca..e104c3454a 100644
--- a/src/main/java/org/apache/sysds/runtime/data/DenseBlockFactory.java
+++ b/src/main/java/org/apache/sysds/runtime/data/DenseBlockFactory.java
@@ -20,7 +20,7 @@
 
 package org.apache.sysds.runtime.data;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.common.Types.ValueType;
 import org.apache.sysds.runtime.DMLRuntimeException;
 import org.apache.sysds.runtime.util.UtilFunctions;
diff --git a/src/main/java/org/apache/sysds/runtime/data/DenseBlockLDRB.java 
b/src/main/java/org/apache/sysds/runtime/data/DenseBlockLDRB.java
index f903a06655..6a1d705b25 100644
--- a/src/main/java/org/apache/sysds/runtime/data/DenseBlockLDRB.java
+++ b/src/main/java/org/apache/sysds/runtime/data/DenseBlockLDRB.java
@@ -23,7 +23,7 @@ package org.apache.sysds.runtime.data;
 
 import java.util.stream.IntStream;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.util.UtilFunctions;
 
 /**
diff --git a/src/main/java/org/apache/sysds/runtime/data/DenseBlockLFP32.java 
b/src/main/java/org/apache/sysds/runtime/data/DenseBlockLFP32.java
index a6d82218f2..266c9635eb 100644
--- a/src/main/java/org/apache/sysds/runtime/data/DenseBlockLFP32.java
+++ b/src/main/java/org/apache/sysds/runtime/data/DenseBlockLFP32.java
@@ -21,7 +21,7 @@ package org.apache.sysds.runtime.data;
 
 import java.util.Arrays;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.common.Types.ValueType;
 import org.apache.sysds.common.Warnings;
 import org.apache.sysds.runtime.util.DataConverter;
diff --git 
a/src/main/java/org/apache/sysds/runtime/data/DenseBlockLFP64DEDUP.java 
b/src/main/java/org/apache/sysds/runtime/data/DenseBlockLFP64DEDUP.java
index 03b072cc4f..3ace83dd50 100644
--- a/src/main/java/org/apache/sysds/runtime/data/DenseBlockLFP64DEDUP.java
+++ b/src/main/java/org/apache/sysds/runtime/data/DenseBlockLFP64DEDUP.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.data;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.common.Types;
 import org.apache.sysds.runtime.util.UtilFunctions;
 
diff --git a/src/main/java/org/apache/sysds/runtime/data/DenseBlockString.java 
b/src/main/java/org/apache/sysds/runtime/data/DenseBlockString.java
index 17688ca884..287c4d0f90 100644
--- a/src/main/java/org/apache/sysds/runtime/data/DenseBlockString.java
+++ b/src/main/java/org/apache/sysds/runtime/data/DenseBlockString.java
@@ -22,7 +22,7 @@ package org.apache.sysds.runtime.data;
 
 import java.util.Arrays;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.common.Types.ValueType;
 import org.apache.sysds.common.Warnings;
 import org.apache.sysds.runtime.util.DataConverter;
diff --git a/src/main/java/org/apache/sysds/runtime/data/LibTensorAgg.java 
b/src/main/java/org/apache/sysds/runtime/data/LibTensorAgg.java
index 6ea603edac..91c09049b3 100644
--- a/src/main/java/org/apache/sysds/runtime/data/LibTensorAgg.java
+++ b/src/main/java/org/apache/sysds/runtime/data/LibTensorAgg.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.data;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.common.Types;
 import org.apache.sysds.runtime.DMLRuntimeException;
 import org.apache.sysds.runtime.functionobjects.Plus;
diff --git a/src/main/java/org/apache/sysds/runtime/data/LibTensorReorg.java 
b/src/main/java/org/apache/sysds/runtime/data/LibTensorReorg.java
index e7dc8af668..e7e60e2333 100644
--- a/src/main/java/org/apache/sysds/runtime/data/LibTensorReorg.java
+++ b/src/main/java/org/apache/sysds/runtime/data/LibTensorReorg.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.data;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.DMLRuntimeException;
 import org.apache.sysds.runtime.meta.DataCharacteristics;
 
diff --git a/src/main/java/org/apache/sysds/runtime/data/TensorBlock.java 
b/src/main/java/org/apache/sysds/runtime/data/TensorBlock.java
index 5047ee2524..0837c058a3 100644
--- a/src/main/java/org/apache/sysds/runtime/data/TensorBlock.java
+++ b/src/main/java/org/apache/sysds/runtime/data/TensorBlock.java
@@ -27,7 +27,7 @@ import java.io.ObjectInput;
 import java.io.ObjectOutput;
 import java.util.Arrays;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.common.Types.BlockType;
 import org.apache.sysds.common.Types.ValueType;
 import org.apache.sysds.runtime.DMLRuntimeException;
diff --git a/src/main/java/org/apache/sysds/runtime/frame/data/FrameBlock.java 
b/src/main/java/org/apache/sysds/runtime/frame/data/FrameBlock.java
index 486bac29fe..dbac8d470c 100644
--- a/src/main/java/org/apache/sysds/runtime/frame/data/FrameBlock.java
+++ b/src/main/java/org/apache/sysds/runtime/frame/data/FrameBlock.java
@@ -37,9 +37,9 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.Function;
 
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.NotImplementedException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.NotImplementedException;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git 
a/src/main/java/org/apache/sysds/runtime/frame/data/columns/Array.java 
b/src/main/java/org/apache/sysds/runtime/frame/data/columns/Array.java
index b544104df0..848b13b8d6 100644
--- a/src/main/java/org/apache/sysds/runtime/frame/data/columns/Array.java
+++ b/src/main/java/org/apache/sysds/runtime/frame/data/columns/Array.java
@@ -25,7 +25,7 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.io.Writable;
diff --git 
a/src/main/java/org/apache/sysds/runtime/frame/data/columns/OptionalArray.java 
b/src/main/java/org/apache/sysds/runtime/frame/data/columns/OptionalArray.java
index 6898e9472c..194d5eae6d 100644
--- 
a/src/main/java/org/apache/sysds/runtime/frame/data/columns/OptionalArray.java
+++ 
b/src/main/java/org/apache/sysds/runtime/frame/data/columns/OptionalArray.java
@@ -23,7 +23,7 @@ import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.common.Types.ValueType;
 import org.apache.sysds.runtime.DMLRuntimeException;
 import org.apache.sysds.runtime.frame.data.columns.ArrayFactory.FrameArrayType;
diff --git 
a/src/main/java/org/apache/sysds/runtime/frame/data/columns/RaggedArray.java 
b/src/main/java/org/apache/sysds/runtime/frame/data/columns/RaggedArray.java
index 4491416848..5010a27a6b 100644
--- a/src/main/java/org/apache/sysds/runtime/frame/data/columns/RaggedArray.java
+++ b/src/main/java/org/apache/sysds/runtime/frame/data/columns/RaggedArray.java
@@ -23,7 +23,7 @@ import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.common.Types.ValueType;
 import org.apache.sysds.runtime.frame.data.columns.ArrayFactory.FrameArrayType;
 import org.apache.sysds.runtime.matrix.data.Pair;
diff --git 
a/src/main/java/org/apache/sysds/runtime/frame/data/columns/StringArray.java 
b/src/main/java/org/apache/sysds/runtime/frame/data/columns/StringArray.java
index e99903d4b3..88e0aac6f0 100644
--- a/src/main/java/org/apache/sysds/runtime/frame/data/columns/StringArray.java
+++ b/src/main/java/org/apache/sysds/runtime/frame/data/columns/StringArray.java
@@ -27,7 +27,7 @@ import java.util.BitSet;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.common.Types.ValueType;
 import org.apache.sysds.runtime.DMLRuntimeException;
 import org.apache.sysds.runtime.frame.data.columns.ArrayFactory.FrameArrayType;
diff --git 
a/src/main/java/org/apache/sysds/runtime/frame/data/lib/FrameLibAppend.java 
b/src/main/java/org/apache/sysds/runtime/frame/data/lib/FrameLibAppend.java
index ba423a2d08..1cc953075f 100644
--- a/src/main/java/org/apache/sysds/runtime/frame/data/lib/FrameLibAppend.java
+++ b/src/main/java/org/apache/sysds/runtime/frame/data/lib/FrameLibAppend.java
@@ -22,7 +22,7 @@ package org.apache.sysds.runtime.frame.data.lib;
 import java.util.Arrays;
 import java.util.HashSet;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.common.Types.ValueType;
diff --git 
a/src/main/java/org/apache/sysds/runtime/functionobjects/RevIndex.java 
b/src/main/java/org/apache/sysds/runtime/functionobjects/RevIndex.java
index 46c9f4fd40..9644a8321e 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/RevIndex.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/RevIndex.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.functionobjects;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.matrix.data.MatrixIndexes;
 import org.apache.sysds.runtime.matrix.data.MatrixValue.CellIndex;
 import org.apache.sysds.runtime.meta.DataCharacteristics;
diff --git 
a/src/main/java/org/apache/sysds/runtime/functionobjects/SortIndex.java 
b/src/main/java/org/apache/sysds/runtime/functionobjects/SortIndex.java
index 8d519e0438..273bbc792b 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/SortIndex.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/SortIndex.java
@@ -20,7 +20,7 @@
 package org.apache.sysds.runtime.functionobjects;
 
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.matrix.data.MatrixIndexes;
 import org.apache.sysds.runtime.matrix.data.MatrixValue.CellIndex;
 import org.apache.sysds.runtime.meta.DataCharacteristics;
diff --git 
a/src/main/java/org/apache/sysds/runtime/instructions/InstructionUtils.java 
b/src/main/java/org/apache/sysds/runtime/instructions/InstructionUtils.java
index dd731c3583..e2ebc30ce9 100644
--- a/src/main/java/org/apache/sysds/runtime/instructions/InstructionUtils.java
+++ b/src/main/java/org/apache/sysds/runtime/instructions/InstructionUtils.java
@@ -22,7 +22,7 @@ package org.apache.sysds.runtime.instructions;
 import java.util.Arrays;
 import java.util.StringTokenizer;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.common.Types;
diff --git 
a/src/main/java/org/apache/sysds/runtime/instructions/cp/CPOperand.java 
b/src/main/java/org/apache/sysds/runtime/instructions/cp/CPOperand.java
index 0f343cd7be..30e61f0542 100644
--- a/src/main/java/org/apache/sysds/runtime/instructions/cp/CPOperand.java
+++ b/src/main/java/org/apache/sysds/runtime/instructions/cp/CPOperand.java
@@ -19,8 +19,8 @@
 
 package org.apache.sysds.runtime.instructions.cp;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.sysds.common.Types.DataType;
 import org.apache.sysds.common.Types.ValueType;
 import org.apache.sysds.runtime.DMLRuntimeException;
diff --git 
a/src/main/java/org/apache/sysds/runtime/instructions/cp/MatrixBuiltinNaryCPInstruction.java
 
b/src/main/java/org/apache/sysds/runtime/instructions/cp/MatrixBuiltinNaryCPInstruction.java
index 2560a86560..75dadc00f4 100644
--- 
a/src/main/java/org/apache/sysds/runtime/instructions/cp/MatrixBuiltinNaryCPInstruction.java
+++ 
b/src/main/java/org/apache/sysds/runtime/instructions/cp/MatrixBuiltinNaryCPInstruction.java
@@ -21,7 +21,7 @@ package org.apache.sysds.runtime.instructions.cp;
 
 import java.util.List;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.sysds.runtime.DMLRuntimeException;
 import org.apache.sysds.runtime.controlprogram.context.ExecutionContext;
diff --git 
a/src/main/java/org/apache/sysds/runtime/instructions/cp/VariableCPInstruction.java
 
b/src/main/java/org/apache/sysds/runtime/instructions/cp/VariableCPInstruction.java
index 8bec222b0d..29f09930f0 100644
--- 
a/src/main/java/org/apache/sysds/runtime/instructions/cp/VariableCPInstruction.java
+++ 
b/src/main/java/org/apache/sysds/runtime/instructions/cp/VariableCPInstruction.java
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.sysds.api.DMLScript;
 import org.apache.sysds.common.Types.DataType;
diff --git 
a/src/main/java/org/apache/sysds/runtime/instructions/fed/ParameterizedBuiltinFEDInstruction.java
 
b/src/main/java/org/apache/sysds/runtime/instructions/fed/ParameterizedBuiltinFEDInstruction.java
index 7654b92ecc..89895cd638 100644
--- 
a/src/main/java/org/apache/sysds/runtime/instructions/fed/ParameterizedBuiltinFEDInstruction.java
+++ 
b/src/main/java/org/apache/sysds/runtime/instructions/fed/ParameterizedBuiltinFEDInstruction.java
@@ -33,7 +33,7 @@ import java.util.stream.Stream;
 import java.util.zip.Adler32;
 import java.util.zip.Checksum;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.SerializationUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.sysds.common.Types;
diff --git 
a/src/main/java/org/apache/sysds/runtime/instructions/fed/UnaryFEDInstruction.java
 
b/src/main/java/org/apache/sysds/runtime/instructions/fed/UnaryFEDInstruction.java
index 623872e963..f025983e74 100644
--- 
a/src/main/java/org/apache/sysds/runtime/instructions/fed/UnaryFEDInstruction.java
+++ 
b/src/main/java/org/apache/sysds/runtime/instructions/fed/UnaryFEDInstruction.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.instructions.fed;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.sysds.hops.fedplanner.FTypes.FType;
 import org.apache.sysds.runtime.DMLRuntimeException;
 import org.apache.sysds.runtime.controlprogram.caching.CacheableData;
diff --git 
a/src/main/java/org/apache/sysds/runtime/instructions/spark/AggregateUnarySketchSPInstruction.java
 
b/src/main/java/org/apache/sysds/runtime/instructions/spark/AggregateUnarySketchSPInstruction.java
index bfdecc635a..f1694c6cbb 100644
--- 
a/src/main/java/org/apache/sysds/runtime/instructions/spark/AggregateUnarySketchSPInstruction.java
+++ 
b/src/main/java/org/apache/sysds/runtime/instructions/spark/AggregateUnarySketchSPInstruction.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.instructions.spark;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.spark.api.java.JavaPairRDD;
 import org.apache.spark.api.java.JavaRDD;
 import org.apache.spark.api.java.function.Function;
diff --git 
a/src/main/java/org/apache/sysds/runtime/instructions/spark/QuantilePickSPInstruction.java
 
b/src/main/java/org/apache/sysds/runtime/instructions/spark/QuantilePickSPInstruction.java
index 845c94aba2..cf8feb7b82 100644
--- 
a/src/main/java/org/apache/sysds/runtime/instructions/spark/QuantilePickSPInstruction.java
+++ 
b/src/main/java/org/apache/sysds/runtime/instructions/spark/QuantilePickSPInstruction.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.instructions.spark;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.spark.api.java.JavaPairRDD;
 import org.apache.spark.api.java.function.Function;
 import org.apache.spark.api.java.function.Function2;
diff --git 
a/src/main/java/org/apache/sysds/runtime/instructions/spark/WriteSPInstruction.java
 
b/src/main/java/org/apache/sysds/runtime/instructions/spark/WriteSPInstruction.java
index 7908976039..4195e303b2 100644
--- 
a/src/main/java/org/apache/sysds/runtime/instructions/spark/WriteSPInstruction.java
+++ 
b/src/main/java/org/apache/sysds/runtime/instructions/spark/WriteSPInstruction.java
@@ -23,7 +23,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Random;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.mapred.SequenceFileOutputFormat;
diff --git a/src/main/java/org/apache/sysds/runtime/io/IOUtilFunctions.java 
b/src/main/java/org/apache/sysds/runtime/io/IOUtilFunctions.java
index bf1e545098..e638dcba9d 100644
--- a/src/main/java/org/apache/sysds/runtime/io/IOUtilFunctions.java
+++ b/src/main/java/org/apache/sysds/runtime/io/IOUtilFunctions.java
@@ -36,7 +36,7 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
 
 import org.apache.commons.io.input.ReaderInputStream;
-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/src/main/java/org/apache/sysds/runtime/io/ReaderTextCSV.java 
b/src/main/java/org/apache/sysds/runtime/io/ReaderTextCSV.java
index ae6027a1ef..19ce97efeb 100644
--- a/src/main/java/org/apache/sysds/runtime/io/ReaderTextCSV.java
+++ b/src/main/java/org/apache/sysds/runtime/io/ReaderTextCSV.java
@@ -28,8 +28,8 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.mutable.MutableInt;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.mutable.MutableInt;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
diff --git 
a/src/main/java/org/apache/sysds/runtime/io/ReaderTextCSVParallel.java 
b/src/main/java/org/apache/sysds/runtime/io/ReaderTextCSVParallel.java
index 5e8c5e180f..9849c78f90 100644
--- a/src/main/java/org/apache/sysds/runtime/io/ReaderTextCSVParallel.java
+++ b/src/main/java/org/apache/sysds/runtime/io/ReaderTextCSVParallel.java
@@ -26,7 +26,7 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.LongWritable;
diff --git a/src/main/java/org/apache/sysds/runtime/io/ReaderTextLIBSVM.java 
b/src/main/java/org/apache/sysds/runtime/io/ReaderTextLIBSVM.java
index 15162d1f73..49615311e5 100644
--- a/src/main/java/org/apache/sysds/runtime/io/ReaderTextLIBSVM.java
+++ b/src/main/java/org/apache/sysds/runtime/io/ReaderTextLIBSVM.java
@@ -27,7 +27,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.lang.mutable.MutableInt;
+import org.apache.commons.lang3.mutable.MutableInt;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
diff --git 
a/src/main/java/org/apache/sysds/runtime/iogen/MatrixGenerateReader.java 
b/src/main/java/org/apache/sysds/runtime/iogen/MatrixGenerateReader.java
index c377dbc294..697475f1c3 100644
--- a/src/main/java/org/apache/sysds/runtime/iogen/MatrixGenerateReader.java
+++ b/src/main/java/org/apache/sysds/runtime/iogen/MatrixGenerateReader.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.iogen;
 
-import org.apache.commons.lang.mutable.MutableInt;
+import org.apache.commons.lang3.mutable.MutableInt;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.sysds.conf.ConfigurationManager;
diff --git 
a/src/main/java/org/apache/sysds/runtime/matrix/data/LibMatrixBincell.java 
b/src/main/java/org/apache/sysds/runtime/matrix/data/LibMatrixBincell.java
index 33d7bb2da5..9314d153fc 100644
--- a/src/main/java/org/apache/sysds/runtime/matrix/data/LibMatrixBincell.java
+++ b/src/main/java/org/apache/sysds/runtime/matrix/data/LibMatrixBincell.java
@@ -27,7 +27,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.runtime.DMLRuntimeException;
diff --git 
a/src/main/java/org/apache/sysds/runtime/matrix/data/LibMatrixCountDistinct.java
 
b/src/main/java/org/apache/sysds/runtime/matrix/data/LibMatrixCountDistinct.java
index eea5dbb075..e86b852399 100644
--- 
a/src/main/java/org/apache/sysds/runtime/matrix/data/LibMatrixCountDistinct.java
+++ 
b/src/main/java/org/apache/sysds/runtime/matrix/data/LibMatrixCountDistinct.java
@@ -24,7 +24,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.api.DMLException;
diff --git 
a/src/main/java/org/apache/sysds/runtime/matrix/data/LibMatrixReorg.java 
b/src/main/java/org/apache/sysds/runtime/matrix/data/LibMatrixReorg.java
index 587fe74af1..c2f07611ed 100644
--- a/src/main/java/org/apache/sysds/runtime/matrix/data/LibMatrixReorg.java
+++ b/src/main/java/org/apache/sysds/runtime/matrix/data/LibMatrixReorg.java
@@ -34,7 +34,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.runtime.DMLRuntimeException;
diff --git 
a/src/main/java/org/apache/sysds/runtime/matrix/data/LibMatrixSketch.java 
b/src/main/java/org/apache/sysds/runtime/matrix/data/LibMatrixSketch.java
index a848ef9480..43a4c1bc5a 100644
--- a/src/main/java/org/apache/sysds/runtime/matrix/data/LibMatrixSketch.java
+++ b/src/main/java/org/apache/sysds/runtime/matrix/data/LibMatrixSketch.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.matrix.data;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.common.Types;
 
 import java.util.HashSet;
diff --git 
a/src/main/java/org/apache/sysds/runtime/matrix/data/MatrixBlock.java 
b/src/main/java/org/apache/sysds/runtime/matrix/data/MatrixBlock.java
index 4c0ee0fc6c..099bf33f47 100644
--- a/src/main/java/org/apache/sysds/runtime/matrix/data/MatrixBlock.java
+++ b/src/main/java/org/apache/sysds/runtime/matrix/data/MatrixBlock.java
@@ -35,7 +35,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.stream.IntStream;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.concurrent.ConcurrentUtils;
 import org.apache.commons.logging.Log;
diff --git 
a/src/main/java/org/apache/sysds/runtime/matrix/data/sketch/MatrixSketchFactory.java
 
b/src/main/java/org/apache/sysds/runtime/matrix/data/sketch/MatrixSketchFactory.java
index 2a2c926aa6..4904ac5a49 100644
--- 
a/src/main/java/org/apache/sysds/runtime/matrix/data/sketch/MatrixSketchFactory.java
+++ 
b/src/main/java/org/apache/sysds/runtime/matrix/data/sketch/MatrixSketchFactory.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.matrix.data.sketch;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import 
org.apache.sysds.runtime.matrix.data.sketch.countdistinct.CountDistinctFunctionSketch;
 import 
org.apache.sysds.runtime.matrix.data.sketch.countdistinctapprox.KMVSketch;
 import org.apache.sysds.runtime.matrix.operators.CountDistinctOperator;
diff --git 
a/src/main/java/org/apache/sysds/runtime/matrix/data/sketch/countdistinctapprox/KMVSketch.java
 
b/src/main/java/org/apache/sysds/runtime/matrix/data/sketch/countdistinctapprox/KMVSketch.java
index 98bfca0df9..c944005c04 100644
--- 
a/src/main/java/org/apache/sysds/runtime/matrix/data/sketch/countdistinctapprox/KMVSketch.java
+++ 
b/src/main/java/org/apache/sysds/runtime/matrix/data/sketch/countdistinctapprox/KMVSketch.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.matrix.data.sketch.countdistinctapprox;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.runtime.DMLRuntimeException;
diff --git 
a/src/main/java/org/apache/sysds/runtime/transform/decode/DecoderFactory.java 
b/src/main/java/org/apache/sysds/runtime/transform/decode/DecoderFactory.java
index df1d4381c9..9189253efe 100644
--- 
a/src/main/java/org/apache/sysds/runtime/transform/decode/DecoderFactory.java
+++ 
b/src/main/java/org/apache/sysds/runtime/transform/decode/DecoderFactory.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.wink.json4j.JSONObject;
 import org.apache.sysds.common.Types.ValueType;
 import org.apache.sysds.runtime.DMLRuntimeException;
diff --git 
a/src/main/java/org/apache/sysds/runtime/transform/encode/ColumnEncoderComposite.java
 
b/src/main/java/org/apache/sysds/runtime/transform/encode/ColumnEncoderComposite.java
index fd69d5bf26..84bf84b516 100644
--- 
a/src/main/java/org/apache/sysds/runtime/transform/encode/ColumnEncoderComposite.java
+++ 
b/src/main/java/org/apache/sysds/runtime/transform/encode/ColumnEncoderComposite.java
@@ -32,7 +32,7 @@ import java.util.Objects;
 import java.util.concurrent.Callable;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.DMLRuntimeException;
 import org.apache.sysds.runtime.controlprogram.caching.CacheBlock;
 import org.apache.sysds.runtime.frame.data.FrameBlock;
diff --git 
a/src/main/java/org/apache/sysds/runtime/transform/encode/ColumnEncoderWordEmbedding.java
 
b/src/main/java/org/apache/sysds/runtime/transform/encode/ColumnEncoderWordEmbedding.java
index 7b7b326431..b6faf4d00b 100644
--- 
a/src/main/java/org/apache/sysds/runtime/transform/encode/ColumnEncoderWordEmbedding.java
+++ 
b/src/main/java/org/apache/sysds/runtime/transform/encode/ColumnEncoderWordEmbedding.java
@@ -24,7 +24,7 @@ import static 
org.apache.sysds.runtime.util.UtilFunctions.getEndIndex;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.controlprogram.caching.CacheBlock;
 import org.apache.sysds.runtime.frame.data.FrameBlock;
 import org.apache.sysds.runtime.matrix.data.MatrixBlock;
diff --git 
a/src/main/java/org/apache/sysds/runtime/transform/encode/CompressedEncode.java 
b/src/main/java/org/apache/sysds/runtime/transform/encode/CompressedEncode.java
index 9f376cd31c..6c8b40c405 100644
--- 
a/src/main/java/org/apache/sysds/runtime/transform/encode/CompressedEncode.java
+++ 
b/src/main/java/org/apache/sysds/runtime/transform/encode/CompressedEncode.java
@@ -28,7 +28,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.common.Types.ValueType;
diff --git 
a/src/main/java/org/apache/sysds/runtime/transform/encode/EncoderFactory.java 
b/src/main/java/org/apache/sysds/runtime/transform/encode/EncoderFactory.java
index 07e84a81e7..1fd52ee829 100644
--- 
a/src/main/java/org/apache/sysds/runtime/transform/encode/EncoderFactory.java
+++ 
b/src/main/java/org/apache/sysds/runtime/transform/encode/EncoderFactory.java
@@ -29,7 +29,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map.Entry;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.api.DMLScript;
diff --git 
a/src/main/java/org/apache/sysds/runtime/transform/encode/EncoderMVImpute.java 
b/src/main/java/org/apache/sysds/runtime/transform/encode/EncoderMVImpute.java
index 3ad43638ba..2f5d156acc 100644
--- 
a/src/main/java/org/apache/sysds/runtime/transform/encode/EncoderMVImpute.java
+++ 
b/src/main/java/org/apache/sysds/runtime/transform/encode/EncoderMVImpute.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.transform.encode;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.sysds.api.DMLScript;
 import org.apache.sysds.runtime.DMLRuntimeException;
 import org.apache.sysds.runtime.frame.data.FrameBlock;
diff --git 
a/src/main/java/org/apache/sysds/runtime/transform/meta/TfMetaUtils.java 
b/src/main/java/org/apache/sysds/runtime/transform/meta/TfMetaUtils.java
index 182591a6a1..5ae26b1c3a 100644
--- a/src/main/java/org/apache/sysds/runtime/transform/meta/TfMetaUtils.java
+++ b/src/main/java/org/apache/sysds/runtime/transform/meta/TfMetaUtils.java
@@ -34,7 +34,7 @@ import java.util.List;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.sysds.api.jmlc.Connection;
 import org.apache.sysds.common.Types.ValueType;
 import org.apache.sysds.lops.Lop;
diff --git a/src/main/java/org/apache/sysds/runtime/util/CommonThreadPool.java 
b/src/main/java/org/apache/sysds/runtime/util/CommonThreadPool.java
index abb1cedd5e..f96c4cc4af 100644
--- a/src/main/java/org/apache/sysds/runtime/util/CommonThreadPool.java
+++ b/src/main/java/org/apache/sysds/runtime/util/CommonThreadPool.java
@@ -30,7 +30,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.DMLRuntimeException;
 import 
org.apache.sysds.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
 
diff --git a/src/main/java/org/apache/sysds/runtime/util/DataConverter.java 
b/src/main/java/org/apache/sysds/runtime/util/DataConverter.java
index 987f85a733..f205ef3022 100644
--- a/src/main/java/org/apache/sysds/runtime/util/DataConverter.java
+++ b/src/main/java/org/apache/sysds/runtime/util/DataConverter.java
@@ -30,7 +30,7 @@ import java.util.List;
 import java.util.Map.Entry;
 import java.util.StringTokenizer;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.math3.linear.Array2DRowRealMatrix;
 import org.apache.commons.math3.linear.BlockRealMatrix;
 import org.apache.commons.math3.linear.RealMatrix;
diff --git a/src/main/java/org/apache/sysds/runtime/util/HDFSTool.java 
b/src/main/java/org/apache/sysds/runtime/util/HDFSTool.java
index 58452b9c9a..6560186e2a 100644
--- a/src/main/java/org/apache/sysds/runtime/util/HDFSTool.java
+++ b/src/main/java/org/apache/sysds/runtime/util/HDFSTool.java
@@ -31,7 +31,7 @@ import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
 
-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.commons.text.StringEscapeUtils;
diff --git a/src/main/java/org/apache/sysds/runtime/util/ProgramConverter.java 
b/src/main/java/org/apache/sysds/runtime/util/ProgramConverter.java
index 8fbfe31125..7585012db7 100644
--- a/src/main/java/org/apache/sysds/runtime/util/ProgramConverter.java
+++ b/src/main/java/org/apache/sysds/runtime/util/ProgramConverter.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.runtime.util;
 
-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.mapred.JobConf;
diff --git a/src/main/java/org/apache/sysds/runtime/util/UtilFunctions.java 
b/src/main/java/org/apache/sysds/runtime/util/UtilFunctions.java
index 5568603104..ee6e14d061 100644
--- a/src/main/java/org/apache/sysds/runtime/util/UtilFunctions.java
+++ b/src/main/java/org/apache/sysds/runtime/util/UtilFunctions.java
@@ -36,7 +36,7 @@ import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.apache.commons.math3.random.RandomDataGenerator;
diff --git a/src/main/java/org/apache/sysds/utils/NativeHelper.java 
b/src/main/java/org/apache/sysds/utils/NativeHelper.java
index f673ba4e4e..e1b3de2f3d 100644
--- a/src/main/java/org/apache/sysds/utils/NativeHelper.java
+++ b/src/main/java/org/apache/sysds/utils/NativeHelper.java
@@ -37,7 +37,7 @@ import java.io.File;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 
 /**
  * This class helps in loading native library.
diff --git a/src/test/java/org/apache/sysds/test/TestUtils.java 
b/src/test/java/org/apache/sysds/test/TestUtils.java
index ae68201b50..6f3d1b5d82 100644
--- a/src/test/java/org/apache/sysds/test/TestUtils.java
+++ b/src/test/java/org/apache/sysds/test/TestUtils.java
@@ -52,7 +52,7 @@ import java.util.StringTokenizer;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
diff --git 
a/src/test/java/org/apache/sysds/test/component/compress/AbstractCompressedUnaryTests.java
 
b/src/test/java/org/apache/sysds/test/component/compress/AbstractCompressedUnaryTests.java
index f579ae5332..f081e7e748 100644
--- 
a/src/test/java/org/apache/sysds/test/component/compress/AbstractCompressedUnaryTests.java
+++ 
b/src/test/java/org/apache/sysds/test/component/compress/AbstractCompressedUnaryTests.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.fail;
 import java.util.Collection;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.CompressedMatrixBlock;
 import org.apache.sysds.runtime.compress.CompressionSettingsBuilder;
 import org.apache.sysds.runtime.compress.colgroup.AColGroup.CompressionType;
diff --git 
a/src/test/java/org/apache/sysds/test/component/compress/CompressedSingleTests.java
 
b/src/test/java/org/apache/sysds/test/component/compress/CompressedSingleTests.java
index fb9233fa6d..087f3d2fd0 100644
--- 
a/src/test/java/org/apache/sysds/test/component/compress/CompressedSingleTests.java
+++ 
b/src/test/java/org/apache/sysds/test/component/compress/CompressedSingleTests.java
@@ -26,7 +26,7 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.runtime.DMLRuntimeException;
diff --git 
a/src/test/java/org/apache/sysds/test/component/compress/CompressedTestBase.java
 
b/src/test/java/org/apache/sysds/test/component/compress/CompressedTestBase.java
index 1c3a67c18a..cf56494f8e 100644
--- 
a/src/test/java/org/apache/sysds/test/component/compress/CompressedTestBase.java
+++ 
b/src/test/java/org/apache/sysds/test/component/compress/CompressedTestBase.java
@@ -29,7 +29,7 @@ import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git 
a/src/test/java/org/apache/sysds/test/component/compress/TestBase.java 
b/src/test/java/org/apache/sysds/test/component/compress/TestBase.java
index 3cd8abeb17..bf6dd508c9 100644
--- a/src/test/java/org/apache/sysds/test/component/compress/TestBase.java
+++ b/src/test/java/org/apache/sysds/test/component/compress/TestBase.java
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.Collection;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.CompressionSettings;
 import org.apache.sysds.runtime.compress.CompressionSettingsBuilder;
 import org.apache.sysds.runtime.compress.colgroup.AColGroup.CompressionType;
diff --git 
a/src/test/java/org/apache/sysds/test/component/compress/colgroup/ColGroupMorphingPerformanceCompare.java
 
b/src/test/java/org/apache/sysds/test/component/compress/colgroup/ColGroupMorphingPerformanceCompare.java
index 917022d0e1..1382da1184 100644
--- 
a/src/test/java/org/apache/sysds/test/component/compress/colgroup/ColGroupMorphingPerformanceCompare.java
+++ 
b/src/test/java/org/apache/sysds/test/component/compress/colgroup/ColGroupMorphingPerformanceCompare.java
@@ -21,7 +21,7 @@ package org.apache.sysds.test.component.compress.colgroup;
 
 import static org.junit.Assert.fail;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.runtime.compress.colgroup.AColGroup.CompressionType;
diff --git 
a/src/test/java/org/apache/sysds/test/component/compress/colgroup/ColGroupTest.java
 
b/src/test/java/org/apache/sysds/test/component/compress/colgroup/ColGroupTest.java
index 0ec1806043..2668bbbbe5 100644
--- 
a/src/test/java/org/apache/sysds/test/component/compress/colgroup/ColGroupTest.java
+++ 
b/src/test/java/org/apache/sysds/test/component/compress/colgroup/ColGroupTest.java
@@ -29,7 +29,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.runtime.DMLRuntimeException;
diff --git 
a/src/test/java/org/apache/sysds/test/component/compress/dictionary/CombineTest.java
 
b/src/test/java/org/apache/sysds/test/component/compress/dictionary/CombineTest.java
index 20bec2036c..5e3286e73c 100644
--- 
a/src/test/java/org/apache/sysds/test/component/compress/dictionary/CombineTest.java
+++ 
b/src/test/java/org/apache/sysds/test/component/compress/dictionary/CombineTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.runtime.compress.colgroup.AColGroup;
diff --git 
a/src/test/java/org/apache/sysds/test/component/compress/dictionary/DeltaDictionaryTest.java
 
b/src/test/java/org/apache/sysds/test/component/compress/dictionary/DeltaDictionaryTest.java
index b61d02737a..5ba6b88d25 100644
--- 
a/src/test/java/org/apache/sysds/test/component/compress/dictionary/DeltaDictionaryTest.java
+++ 
b/src/test/java/org/apache/sysds/test/component/compress/dictionary/DeltaDictionaryTest.java
@@ -18,7 +18,7 @@
  */
 package org.apache.sysds.test.component.compress.dictionary;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.colgroup.dictionary.DeltaDictionary;
 import org.apache.sysds.runtime.functionobjects.And;
 import org.apache.sysds.runtime.functionobjects.Divide;
diff --git 
a/src/test/java/org/apache/sysds/test/component/compress/estim/encoding/EncodeNegativeTest.java
 
b/src/test/java/org/apache/sysds/test/component/compress/estim/encoding/EncodeNegativeTest.java
index a3e8a6c2d7..d2d255c0da 100644
--- 
a/src/test/java/org/apache/sysds/test/component/compress/estim/encoding/EncodeNegativeTest.java
+++ 
b/src/test/java/org/apache/sysds/test/component/compress/estim/encoding/EncodeNegativeTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.test.component.compress.estim.encoding;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.compress.estim.encoding.EncodingFactory;
 import org.apache.sysds.runtime.data.DenseBlockFP64;
 import org.apache.sysds.runtime.matrix.data.MatrixBlock;
diff --git 
a/src/test/java/org/apache/sysds/test/component/compress/io/IONegativeTest.java 
b/src/test/java/org/apache/sysds/test/component/compress/io/IONegativeTest.java
index 9d598df93f..b8140ace2a 100644
--- 
a/src/test/java/org/apache/sysds/test/component/compress/io/IONegativeTest.java
+++ 
b/src/test/java/org/apache/sysds/test/component/compress/io/IONegativeTest.java
@@ -21,7 +21,7 @@ package org.apache.sysds.test.component.compress.io;
 
 import java.io.IOException;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.runtime.DMLRuntimeException;
 import org.apache.sysds.runtime.compress.io.CompressedWriteBlock;
 import org.apache.sysds.runtime.compress.io.ReaderCompressed;
diff --git 
a/src/test/java/org/apache/sysds/test/component/compress/mapping/MappingTests.java
 
b/src/test/java/org/apache/sysds/test/component/compress/mapping/MappingTests.java
index 284876403e..0cd6a68d42 100644
--- 
a/src/test/java/org/apache/sysds/test/component/compress/mapping/MappingTests.java
+++ 
b/src/test/java/org/apache/sysds/test/component/compress/mapping/MappingTests.java
@@ -32,7 +32,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Random;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.runtime.compress.colgroup.IMapToDataGroup;
diff --git 
a/src/test/java/org/apache/sysds/test/component/compress/offset/OffsetTestPreAggregateSparse.java
 
b/src/test/java/org/apache/sysds/test/component/compress/offset/OffsetTestPreAggregateSparse.java
index c4bc715ffc..1298db4f07 100644
--- 
a/src/test/java/org/apache/sysds/test/component/compress/offset/OffsetTestPreAggregateSparse.java
+++ 
b/src/test/java/org/apache/sysds/test/component/compress/offset/OffsetTestPreAggregateSparse.java
@@ -25,7 +25,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.math3.util.Precision;
diff --git 
a/src/test/java/org/apache/sysds/test/component/estim/OpBindChainTest.java 
b/src/test/java/org/apache/sysds/test/component/estim/OpBindChainTest.java
index 12c66cf8c2..1e592be238 100644
--- a/src/test/java/org/apache/sysds/test/component/estim/OpBindChainTest.java
+++ b/src/test/java/org/apache/sysds/test/component/estim/OpBindChainTest.java
@@ -31,7 +31,7 @@ import org.apache.sysds.runtime.instructions.InstructionUtils;
 import org.apache.sysds.runtime.matrix.data.MatrixBlock;
 import org.apache.sysds.test.AutomatedTestBase;
 import org.apache.sysds.test.TestUtils;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 
 /**
  * this is the basic operation check for all estimators with single operations
diff --git 
a/src/test/java/org/apache/sysds/test/component/estim/OpBindTest.java 
b/src/test/java/org/apache/sysds/test/component/estim/OpBindTest.java
index 568485ca9b..e36b5f6e0c 100644
--- a/src/test/java/org/apache/sysds/test/component/estim/OpBindTest.java
+++ b/src/test/java/org/apache/sysds/test/component/estim/OpBindTest.java
@@ -29,7 +29,7 @@ import org.apache.sysds.hops.estim.SparsityEstimator.OpCode;
 import org.apache.sysds.runtime.matrix.data.MatrixBlock;
 import org.apache.sysds.test.AutomatedTestBase;
 import org.apache.sysds.test.TestUtils;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 
 /**
  * this is the basic operation check for all estimators with single operations
diff --git 
a/src/test/java/org/apache/sysds/test/component/estim/OpElemWChainTest.java 
b/src/test/java/org/apache/sysds/test/component/estim/OpElemWChainTest.java
index 7a76d7a447..f008026dc3 100644
--- a/src/test/java/org/apache/sysds/test/component/estim/OpElemWChainTest.java
+++ b/src/test/java/org/apache/sysds/test/component/estim/OpElemWChainTest.java
@@ -33,7 +33,7 @@ import org.apache.sysds.runtime.matrix.data.MatrixBlock;
 import org.apache.sysds.runtime.matrix.operators.BinaryOperator;
 import org.apache.sysds.test.AutomatedTestBase;
 import org.apache.sysds.test.TestUtils;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 
 /**
  * this is the basic operation check for all estimators with single operations
diff --git 
a/src/test/java/org/apache/sysds/test/component/estim/OpElemWTest.java 
b/src/test/java/org/apache/sysds/test/component/estim/OpElemWTest.java
index 65ef5385d4..dae0bb4ddc 100644
--- a/src/test/java/org/apache/sysds/test/component/estim/OpElemWTest.java
+++ b/src/test/java/org/apache/sysds/test/component/estim/OpElemWTest.java
@@ -34,7 +34,7 @@ import org.apache.sysds.runtime.matrix.data.MatrixBlock;
 import org.apache.sysds.runtime.matrix.operators.BinaryOperator;
 import org.apache.sysds.test.AutomatedTestBase;
 import org.apache.sysds.test.TestUtils;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 
 /**
  * this is the basic operation check for all estimators with single operations
diff --git 
a/src/test/java/org/apache/sysds/test/component/estim/OpSingleTest.java 
b/src/test/java/org/apache/sysds/test/component/estim/OpSingleTest.java
index ea4a6fac19..ea34ac1432 100644
--- a/src/test/java/org/apache/sysds/test/component/estim/OpSingleTest.java
+++ b/src/test/java/org/apache/sysds/test/component/estim/OpSingleTest.java
@@ -20,7 +20,7 @@
 package org.apache.sysds.test.component.estim;
 
 import org.junit.Test;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.hops.estim.EstimatorBasicAvg;
 import org.apache.sysds.hops.estim.EstimatorBasicWorst;
 import org.apache.sysds.hops.estim.EstimatorBitsetMM;
diff --git 
a/src/test/java/org/apache/sysds/test/component/frame/array/CustomArrayTests.java
 
b/src/test/java/org/apache/sysds/test/component/frame/array/CustomArrayTests.java
index 2bbd7f8515..7de3035c59 100644
--- 
a/src/test/java/org/apache/sysds/test/component/frame/array/CustomArrayTests.java
+++ 
b/src/test/java/org/apache/sysds/test/component/frame/array/CustomArrayTests.java
@@ -30,7 +30,7 @@ import java.util.BitSet;
 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.sysds.common.Types.ValueType;
diff --git 
a/src/test/java/org/apache/sysds/test/component/frame/array/FrameArrayTests.java
 
b/src/test/java/org/apache/sysds/test/component/frame/array/FrameArrayTests.java
index a5acb13381..d59e68a91c 100644
--- 
a/src/test/java/org/apache/sysds/test/component/frame/array/FrameArrayTests.java
+++ 
b/src/test/java/org/apache/sysds/test/component/frame/array/FrameArrayTests.java
@@ -34,7 +34,7 @@ import java.util.BitSet;
 import java.util.Collection;
 import java.util.Random;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.common.Types.ValueType;
diff --git 
a/src/test/java/org/apache/sysds/test/component/frame/array/NegativeArrayTests.java
 
b/src/test/java/org/apache/sysds/test/component/frame/array/NegativeArrayTests.java
index 61442cdd0f..ab98354b3f 100644
--- 
a/src/test/java/org/apache/sysds/test/component/frame/array/NegativeArrayTests.java
+++ 
b/src/test/java/org/apache/sysds/test/component/frame/array/NegativeArrayTests.java
@@ -25,7 +25,7 @@ import static org.mockito.Mockito.mock;
 
 import java.io.IOException;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.common.Types.ValueType;
 import org.apache.sysds.runtime.DMLRuntimeException;
 import org.apache.sysds.runtime.compress.DMLCompressionException;
diff --git 
a/src/test/java/org/apache/sysds/test/component/frame/transform/TransformCustomTest.java
 
b/src/test/java/org/apache/sysds/test/component/frame/transform/TransformCustomTest.java
index d1b2479375..92f074c20c 100644
--- 
a/src/test/java/org/apache/sysds/test/component/frame/transform/TransformCustomTest.java
+++ 
b/src/test/java/org/apache/sysds/test/component/frame/transform/TransformCustomTest.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.fail;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.common.Types.ValueType;
diff --git 
a/src/test/java/org/apache/sysds/test/component/matrix/BinaryOperationInPlaceTestParameterized.java
 
b/src/test/java/org/apache/sysds/test/component/matrix/BinaryOperationInPlaceTestParameterized.java
index 05f29afcc5..45dc59b0fb 100644
--- 
a/src/test/java/org/apache/sysds/test/component/matrix/BinaryOperationInPlaceTestParameterized.java
+++ 
b/src/test/java/org/apache/sysds/test/component/matrix/BinaryOperationInPlaceTestParameterized.java
@@ -26,7 +26,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sysds.runtime.DMLRuntimeException;
diff --git 
a/src/test/java/org/apache/sysds/test/component/matrix/CountDistinctTest.java 
b/src/test/java/org/apache/sysds/test/component/matrix/CountDistinctTest.java
index 4b4909e27a..3d5ef5f4cd 100644
--- 
a/src/test/java/org/apache/sysds/test/component/matrix/CountDistinctTest.java
+++ 
b/src/test/java/org/apache/sysds/test/component/matrix/CountDistinctTest.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.fail;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.api.DMLException;
 import org.apache.sysds.common.Types;
 import org.apache.sysds.runtime.functionobjects.ReduceAll;
diff --git 
a/src/test/java/org/apache/sysds/test/component/misc/MemoryEstimateTest.java 
b/src/test/java/org/apache/sysds/test/component/misc/MemoryEstimateTest.java
index e3fa88ce3f..8c8e31535b 100644
--- a/src/test/java/org/apache/sysds/test/component/misc/MemoryEstimateTest.java
+++ b/src/test/java/org/apache/sysds/test/component/misc/MemoryEstimateTest.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertEquals;
 import java.util.ArrayList;
 import java.util.Random;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.utils.MemoryEstimates;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git 
a/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockConstIndexingTest.java
 
b/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockConstIndexingTest.java
index 05e011233d..c2aa9b82e7 100644
--- 
a/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockConstIndexingTest.java
+++ 
b/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockConstIndexingTest.java
@@ -21,7 +21,7 @@ package org.apache.sysds.test.component.tensor;
 
 import static org.junit.Assert.fail;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.sysds.common.Types.ValueType;
 import org.apache.sysds.runtime.data.DenseBlock;
 import org.apache.sysds.runtime.data.DenseBlockFactory;
diff --git 
a/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockConstructionTest.java
 
b/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockConstructionTest.java
index 2bbdd8643e..9a95dffa0e 100644
--- 
a/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockConstructionTest.java
+++ 
b/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockConstructionTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.test.component.tensor;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.junit.Assert;
 import org.junit.Test;
 import org.apache.sysds.common.Types.ValueType;
diff --git 
a/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockCountNonZeroTest.java
 
b/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockCountNonZeroTest.java
index 8f2a9a5edb..bf492fa49f 100644
--- 
a/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockCountNonZeroTest.java
+++ 
b/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockCountNonZeroTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.test.component.tensor;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.junit.Assert;
 import org.junit.Test;
 import org.apache.sysds.common.Types.ValueType;
diff --git 
a/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockGetSetIndexingTest.java
 
b/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockGetSetIndexingTest.java
index 93edeba474..b4ba11d017 100644
--- 
a/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockGetSetIndexingTest.java
+++ 
b/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockGetSetIndexingTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.test.component.tensor;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.junit.Assert;
 import org.junit.Test;
 import org.apache.sysds.common.Types.ValueType;
diff --git 
a/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockIncrementTest.java
 
b/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockIncrementTest.java
index e17646b36a..f51cc6c205 100644
--- 
a/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockIncrementTest.java
+++ 
b/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockIncrementTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.test.component.tensor;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.junit.Assert;
 import org.junit.Test;
 import org.apache.sysds.common.Types.ValueType;
diff --git 
a/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockSetDenseBlockTest.java
 
b/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockSetDenseBlockTest.java
index 4afd568918..16e1f8bf98 100644
--- 
a/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockSetDenseBlockTest.java
+++ 
b/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockSetDenseBlockTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.test.component.tensor;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.junit.Assert;
 import org.junit.Test;
 import org.apache.sysds.common.Types.ValueType;
diff --git 
a/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockSetRowTest.java
 
b/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockSetRowTest.java
index 3e2d946099..44623736b5 100644
--- 
a/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockSetRowTest.java
+++ 
b/src/test/java/org/apache/sysds/test/component/tensor/DenseBlockSetRowTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.test.component.tensor;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.junit.Assert;
 import org.junit.Test;
 import org.apache.sysds.common.Types.ValueType;
diff --git 
a/src/test/java/org/apache/sysds/test/functions/builtin/part2/BuiltinMCCTest.java
 
b/src/test/java/org/apache/sysds/test/functions/builtin/part2/BuiltinMCCTest.java
index 24cb57cc11..b55ff7cbe2 100644
--- 
a/src/test/java/org/apache/sysds/test/functions/builtin/part2/BuiltinMCCTest.java
+++ 
b/src/test/java/org/apache/sysds/test/functions/builtin/part2/BuiltinMCCTest.java
@@ -22,7 +22,7 @@ package org.apache.sysds.test.functions.builtin.part2;
 import org.apache.sysds.common.Types.ExecMode;
 
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.sysds.runtime.lineage.LineageCacheConfig.ReuseCacheType;
 import org.apache.sysds.runtime.matrix.data.MatrixValue.CellIndex;
 import org.apache.sysds.test.AutomatedTestBase;
diff --git 
a/src/test/java/org/apache/sysds/test/functions/builtin/part2/BuiltinMiceTest.java
 
b/src/test/java/org/apache/sysds/test/functions/builtin/part2/BuiltinMiceTest.java
index 712a915a6c..36e2250732 100644
--- 
a/src/test/java/org/apache/sysds/test/functions/builtin/part2/BuiltinMiceTest.java
+++ 
b/src/test/java/org/apache/sysds/test/functions/builtin/part2/BuiltinMiceTest.java
@@ -21,7 +21,7 @@ package org.apache.sysds.test.functions.builtin.part2;
 
 import java.util.HashMap;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.sysds.common.Types;
 import org.apache.sysds.common.Types.ExecType;
 import org.apache.sysds.runtime.lineage.LineageCacheConfig.ReuseCacheType;
diff --git 
a/src/test/java/org/apache/sysds/test/functions/builtin/part2/BuiltinNaLocfTest.java
 
b/src/test/java/org/apache/sysds/test/functions/builtin/part2/BuiltinNaLocfTest.java
index 64999e46ae..dea03525b5 100644
--- 
a/src/test/java/org/apache/sysds/test/functions/builtin/part2/BuiltinNaLocfTest.java
+++ 
b/src/test/java/org/apache/sysds/test/functions/builtin/part2/BuiltinNaLocfTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.test.functions.builtin.part2;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.sysds.common.Types;
 import org.apache.sysds.common.Types.ExecType;
 import org.apache.sysds.runtime.lineage.Lineage;
diff --git 
a/src/test/java/org/apache/sysds/test/functions/codegenalg/partone/AlgorithmMSVM.java
 
b/src/test/java/org/apache/sysds/test/functions/codegenalg/partone/AlgorithmMSVM.java
index ef9a7b4d34..f8ebdcd997 100644
--- 
a/src/test/java/org/apache/sysds/test/functions/codegenalg/partone/AlgorithmMSVM.java
+++ 
b/src/test/java/org/apache/sysds/test/functions/codegenalg/partone/AlgorithmMSVM.java
@@ -22,7 +22,7 @@ package org.apache.sysds.test.functions.codegenalg.partone;
 import java.io.File;
 import java.util.HashMap;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.junit.Assert;
 import org.junit.Test;
 import org.apache.sysds.api.DMLScript;
diff --git 
a/src/test/java/org/apache/sysds/test/functions/data/misc/MatrixMarketFormatTest.java
 
b/src/test/java/org/apache/sysds/test/functions/data/misc/MatrixMarketFormatTest.java
index a7580d2ff6..9cac2ef513 100644
--- 
a/src/test/java/org/apache/sysds/test/functions/data/misc/MatrixMarketFormatTest.java
+++ 
b/src/test/java/org/apache/sysds/test/functions/data/misc/MatrixMarketFormatTest.java
@@ -38,7 +38,7 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.util.Iterator;
 
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 
diff --git 
a/src/test/java/org/apache/sysds/test/functions/federated/monitoring/FederatedCoordinatorIntegrationCRUDTest.java
 
b/src/test/java/org/apache/sysds/test/functions/federated/monitoring/FederatedCoordinatorIntegrationCRUDTest.java
index 41dfe503c6..1422f23798 100644
--- 
a/src/test/java/org/apache/sysds/test/functions/federated/monitoring/FederatedCoordinatorIntegrationCRUDTest.java
+++ 
b/src/test/java/org/apache/sysds/test/functions/federated/monitoring/FederatedCoordinatorIntegrationCRUDTest.java
@@ -21,7 +21,7 @@ package org.apache.sysds.test.functions.federated.monitoring;
 
 import static org.junit.Assert.fail;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
 import 
org.apache.sysds.runtime.controlprogram.federated.monitoring.models.CoordinatorModel;
 import org.apache.sysds.test.TestConfiguration;
diff --git 
a/src/test/java/org/apache/sysds/test/functions/federated/monitoring/FederatedWorkerIntegrationCRUDTest.java
 
b/src/test/java/org/apache/sysds/test/functions/federated/monitoring/FederatedWorkerIntegrationCRUDTest.java
index 958b5541ea..6e418c0e64 100644
--- 
a/src/test/java/org/apache/sysds/test/functions/federated/monitoring/FederatedWorkerIntegrationCRUDTest.java
+++ 
b/src/test/java/org/apache/sysds/test/functions/federated/monitoring/FederatedWorkerIntegrationCRUDTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.sysds.test.functions.federated.monitoring;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
 import 
org.apache.sysds.runtime.controlprogram.federated.monitoring.models.WorkerModel;
 import org.apache.sysds.test.TestConfiguration;
diff --git 
a/src/test/java/org/apache/sysds/test/functions/federated/transform/TransformFederatedEncodeApplyTest.java
 
b/src/test/java/org/apache/sysds/test/functions/federated/transform/TransformFederatedEncodeApplyTest.java
index 16f18b4a2b..e1553928cf 100644
--- 
a/src/test/java/org/apache/sysds/test/functions/federated/transform/TransformFederatedEncodeApplyTest.java
+++ 
b/src/test/java/org/apache/sysds/test/functions/federated/transform/TransformFederatedEncodeApplyTest.java
@@ -21,7 +21,7 @@ package org.apache.sysds.test.functions.federated.transform;
 
 import java.io.IOException;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.sysds.common.Types;
 import org.apache.sysds.common.Types.ExecMode;
 import org.apache.sysds.common.Types.FileFormat;
diff --git 
a/src/test/java/org/apache/sysds/test/functions/jmlc/FrameReadMetaTest.java 
b/src/test/java/org/apache/sysds/test/functions/jmlc/FrameReadMetaTest.java
index 77cd2aa202..ff8517c9c6 100644
--- a/src/test/java/org/apache/sysds/test/functions/jmlc/FrameReadMetaTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/jmlc/FrameReadMetaTest.java
@@ -25,7 +25,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.sysds.api.jmlc.Connection;
 import org.apache.sysds.api.jmlc.PreparedScript;
 import org.apache.sysds.api.jmlc.ResultVariables;
diff --git 
a/src/test/java/org/apache/sysds/test/functions/misc/IPAFunctionInliningTest.java
 
b/src/test/java/org/apache/sysds/test/functions/misc/IPAFunctionInliningTest.java
index ca9d1569ba..caac2d2b89 100644
--- 
a/src/test/java/org/apache/sysds/test/functions/misc/IPAFunctionInliningTest.java
+++ 
b/src/test/java/org/apache/sysds/test/functions/misc/IPAFunctionInliningTest.java
@@ -28,7 +28,7 @@ import org.apache.sysds.test.AutomatedTestBase;
 import org.apache.sysds.test.TestConfiguration;
 import org.apache.sysds.test.TestUtils;
 import org.apache.sysds.utils.Statistics;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 
 public class IPAFunctionInliningTest extends AutomatedTestBase 
 {

Reply via email to