This is an automated email from the ASF dual-hosted git repository. stigahuang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/impala.git
commit 740ee28eb1288472b61f5da0573ba072c5a8bb6e Author: Michael Smith <[email protected]> AuthorDate: Tue Dec 17 09:58:15 2024 -0800 IMPALA-13618: Move to commons-lang3 Updates from commons-lang (2.6) to commons-lang3. Switches getFullStackTrace to getStackTrace. getFullStackTrace is not present in lang3, and https://issues.apache.org/jira/browse/LANG-904 suggests that getFullStackTrace existed for handling chained exceptions in older Java runtimes. Change-Id: Ie16af2692858f6a571cc1e5b85ecba3806da8d7e Reviewed-on: http://gerrit.cloudera.org:8080/22228 Reviewed-by: Impala Public Jenkins <[email protected]> Tested-by: Impala Public Jenkins <[email protected]> --- bin/impala-config.sh | 1 - fe/pom.xml | 5 ++--- fe/src/main/java/org/apache/impala/analysis/FunctionName.java | 2 +- fe/src/main/java/org/apache/impala/analysis/StatementBase.java | 2 +- fe/src/main/java/org/apache/impala/analysis/ToSqlUtils.java | 4 ++-- fe/src/main/java/org/apache/impala/analysis/TupleDescriptor.java | 2 +- .../impala/authorization/ranger/RangerAuthorizationChecker.java | 2 +- fe/src/main/java/org/apache/impala/catalog/FeIcebergTable.java | 2 +- fe/src/main/java/org/apache/impala/catalog/Function.java | 2 +- fe/src/main/java/org/apache/impala/catalog/HdfsPartition.java | 2 +- fe/src/main/java/org/apache/impala/catalog/HdfsTable.java | 2 +- fe/src/main/java/org/apache/impala/catalog/IcebergDeleteTable.java | 2 +- .../org/apache/impala/catalog/events/MetastoreEventsProcessor.java | 6 +++--- .../java/org/apache/impala/catalog/local/DirectMetaProvider.java | 2 +- .../impala/catalog/metastore/CatalogMetastoreServiceHandler.java | 6 +++--- .../org/apache/impala/catalog/monitor/CatalogOperationCounter.java | 2 +- fe/src/main/java/org/apache/impala/common/JniUtil.java | 2 +- .../org/apache/impala/extdatasource/ExternalDataSourceExecutor.java | 2 +- .../java/org/apache/impala/extdatasource/jdbc/JdbcDataSource.java | 2 +- fe/src/main/java/org/apache/impala/hooks/QueryEventHookManager.java | 2 +- fe/src/main/java/org/apache/impala/service/CatalogOpExecutor.java | 2 +- fe/src/main/java/org/apache/impala/service/Frontend.java | 2 +- fe/src/main/java/org/apache/impala/service/JniFrontend.java | 2 +- .../main/java/org/apache/impala/util/HiveMetadataFormatUtils.java | 2 +- fe/src/main/java/org/apache/impala/util/JniRequestPoolService.java | 2 +- .../java/org/apache/impala/authorization/AuthorizationStmtTest.java | 2 +- .../apache/impala/catalog/events/MetastoreEventsProcessorTest.java | 2 +- .../org/apache/impala/customservice/KuduHMSIntegrationTest.java | 2 +- fe/src/test/java/org/apache/impala/planner/PlannerTestBase.java | 2 +- java/TableFlattener/pom.xml | 5 ++--- .../org/apache/impala/infra/tableflattener/SchemaFlattener.java | 2 +- java/pom.xml | 1 - 32 files changed, 37 insertions(+), 41 deletions(-) diff --git a/bin/impala-config.sh b/bin/impala-config.sh index 64c8d0c21..47f79d41e 100755 --- a/bin/impala-config.sh +++ b/bin/impala-config.sh @@ -260,7 +260,6 @@ export APACHE_OZONE_VERSION=1.4.0 # Java dependencies that are not also runtime components. Declaring versions here allows # other branches to override them in impala-config-branch.sh for cleaner patches. export IMPALA_BOUNCY_CASTLE_VERSION=1.78 -export IMPALA_COMMONS_IO_VERSION=2.6 export IMPALA_COMMONS_LANG3_VERSION=3.17.0 export IMPALA_COS_VERSION=3.1.0-8.0.8 export IMPALA_DERBY_VERSION=10.14.2.0 diff --git a/fe/pom.xml b/fe/pom.xml index f75189f2e..450f27280 100644 --- a/fe/pom.xml +++ b/fe/pom.xml @@ -281,9 +281,8 @@ under the License. </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>${commons-io.version}</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> diff --git a/fe/src/main/java/org/apache/impala/analysis/FunctionName.java b/fe/src/main/java/org/apache/impala/analysis/FunctionName.java index 33b1dc803..76f8cbb66 100644 --- a/fe/src/main/java/org/apache/impala/analysis/FunctionName.java +++ b/fe/src/main/java/org/apache/impala/analysis/FunctionName.java @@ -20,7 +20,7 @@ package org.apache.impala.analysis; import java.util.List; import java.util.Objects; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.impala.authorization.Privilege; import org.apache.impala.catalog.BuiltinsDb; import org.apache.impala.catalog.Db; diff --git a/fe/src/main/java/org/apache/impala/analysis/StatementBase.java b/fe/src/main/java/org/apache/impala/analysis/StatementBase.java index 39829b60a..8f45c0e40 100644 --- a/fe/src/main/java/org/apache/impala/analysis/StatementBase.java +++ b/fe/src/main/java/org/apache/impala/analysis/StatementBase.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import java.util.Optional; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.impala.catalog.Column; import org.apache.impala.catalog.ScalarType; import org.apache.impala.catalog.Type; diff --git a/fe/src/main/java/org/apache/impala/analysis/ToSqlUtils.java b/fe/src/main/java/org/apache/impala/analysis/ToSqlUtils.java index c4489f692..97bf4fd17 100755 --- a/fe/src/main/java/org/apache/impala/analysis/ToSqlUtils.java +++ b/fe/src/main/java/org/apache/impala/analysis/ToSqlUtils.java @@ -29,8 +29,8 @@ import org.antlr.runtime.ANTLRStringStream; import org.antlr.runtime.RecognitionException; import org.antlr.runtime.Token; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.ObjectUtils; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringEscapeUtils; import org.apache.hadoop.hive.common.StatsSetupConst; import org.apache.hadoop.hive.ql.parse.HiveLexer; import org.apache.impala.catalog.CatalogException; diff --git a/fe/src/main/java/org/apache/impala/analysis/TupleDescriptor.java b/fe/src/main/java/org/apache/impala/analysis/TupleDescriptor.java index cbcd4f6ca..37e8b1449 100644 --- a/fe/src/main/java/org/apache/impala/analysis/TupleDescriptor.java +++ b/fe/src/main/java/org/apache/impala/analysis/TupleDescriptor.java @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.impala.catalog.ColumnStats; import org.apache.impala.catalog.FeFsTable; import org.apache.impala.catalog.FeKuduTable; diff --git a/fe/src/main/java/org/apache/impala/authorization/ranger/RangerAuthorizationChecker.java b/fe/src/main/java/org/apache/impala/authorization/ranger/RangerAuthorizationChecker.java index b5dadfdd6..4f9bdb18e 100644 --- a/fe/src/main/java/org/apache/impala/authorization/ranger/RangerAuthorizationChecker.java +++ b/fe/src/main/java/org/apache/impala/authorization/ranger/RangerAuthorizationChecker.java @@ -20,7 +20,7 @@ package org.apache.impala.authorization.ranger; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.security.UserGroupInformation; import org.apache.impala.analysis.AnalysisContext.AnalysisResult; import org.apache.impala.authorization.Authorizable; diff --git a/fe/src/main/java/org/apache/impala/catalog/FeIcebergTable.java b/fe/src/main/java/org/apache/impala/catalog/FeIcebergTable.java index 6837a140d..bad11d109 100644 --- a/fe/src/main/java/org/apache/impala/catalog/FeIcebergTable.java +++ b/fe/src/main/java/org/apache/impala/catalog/FeIcebergTable.java @@ -34,7 +34,7 @@ import java.util.Set; import java.util.TreeMap; import java.util.stream.Collectors; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.fs.BlockLocation; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; diff --git a/fe/src/main/java/org/apache/impala/catalog/Function.java b/fe/src/main/java/org/apache/impala/catalog/Function.java index 8f706d73a..6c842fad2 100644 --- a/fe/src/main/java/org/apache/impala/catalog/Function.java +++ b/fe/src/main/java/org/apache/impala/catalog/Function.java @@ -22,7 +22,7 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.impala.analysis.FunctionName; import org.apache.impala.analysis.HdfsUri; import org.apache.impala.common.AnalysisException; diff --git a/fe/src/main/java/org/apache/impala/catalog/HdfsPartition.java b/fe/src/main/java/org/apache/impala/catalog/HdfsPartition.java index 32276be55..40978e3d5 100644 --- a/fe/src/main/java/org/apache/impala/catalog/HdfsPartition.java +++ b/fe/src/main/java/org/apache/impala/catalog/HdfsPartition.java @@ -47,7 +47,7 @@ import java.util.concurrent.atomic.AtomicLong; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.fs.BlockLocation; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.Path; diff --git a/fe/src/main/java/org/apache/impala/catalog/HdfsTable.java b/fe/src/main/java/org/apache/impala/catalog/HdfsTable.java index 610fb241f..e6331fed0 100644 --- a/fe/src/main/java/org/apache/impala/catalog/HdfsTable.java +++ b/fe/src/main/java/org/apache/impala/catalog/HdfsTable.java @@ -34,7 +34,7 @@ import java.util.stream.Collectors; import javax.annotation.Nullable; import org.apache.avro.Schema; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/fe/src/main/java/org/apache/impala/catalog/IcebergDeleteTable.java b/fe/src/main/java/org/apache/impala/catalog/IcebergDeleteTable.java index 40f2c2c94..26253d0cc 100644 --- a/fe/src/main/java/org/apache/impala/catalog/IcebergDeleteTable.java +++ b/fe/src/main/java/org/apache/impala/catalog/IcebergDeleteTable.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.iceberg.Table; import org.apache.impala.analysis.IcebergPartitionSpec; import org.apache.impala.catalog.CatalogObject.ThriftObjectType; diff --git a/fe/src/main/java/org/apache/impala/catalog/events/MetastoreEventsProcessor.java b/fe/src/main/java/org/apache/impala/catalog/events/MetastoreEventsProcessor.java index 40408ff44..6c8583481 100644 --- a/fe/src/main/java/org/apache/impala/catalog/events/MetastoreEventsProcessor.java +++ b/fe/src/main/java/org/apache/impala/catalog/events/MetastoreEventsProcessor.java @@ -37,7 +37,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import javax.annotation.Nullable; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.hadoop.hive.metastore.IMetaStoreClient; import org.apache.hadoop.hive.metastore.IMetaStoreClient.NotificationFilter; import org.apache.hadoop.hive.metastore.api.CurrentNotificationEventId; @@ -1087,7 +1087,7 @@ public class MetastoreEventsProcessor implements ExternalEventsProcessor { String msg = "Event processing needs a invalidate command to resolve the state"; LOG.error(msg, ex); eventProcessorErrorMsg_ = LocalDateTime.now().toString() + '\n' + msg + '\n' + - ExceptionUtils.getFullStackTrace(ex); + ExceptionUtils.getStackTrace(ex); tryAutoGlobalInvalidateOnFailure(); } catch (Exception ex) { // There are lot of Preconditions which can throw RuntimeExceptions when we @@ -1097,7 +1097,7 @@ public class MetastoreEventsProcessor implements ExternalEventsProcessor { String msg = "Unexpected exception received while processing event"; LOG.error(msg, ex); eventProcessorErrorMsg_ = LocalDateTime.now().toString() + '\n' + msg + '\n' + - ExceptionUtils.getFullStackTrace(ex); + ExceptionUtils.getStackTrace(ex); dumpEventInfoToLog(currentEvent_); tryAutoGlobalInvalidateOnFailure(); } diff --git a/fe/src/main/java/org/apache/impala/catalog/local/DirectMetaProvider.java b/fe/src/main/java/org/apache/impala/catalog/local/DirectMetaProvider.java index 57efff547..f860f44c4 100644 --- a/fe/src/main/java/org/apache/impala/catalog/local/DirectMetaProvider.java +++ b/fe/src/main/java/org/apache/impala/catalog/local/DirectMetaProvider.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.metastore.api.ColumnStatisticsObj; import org.apache.hadoop.hive.metastore.api.Database; diff --git a/fe/src/main/java/org/apache/impala/catalog/metastore/CatalogMetastoreServiceHandler.java b/fe/src/main/java/org/apache/impala/catalog/metastore/CatalogMetastoreServiceHandler.java index 8df9673ff..3ee08483f 100644 --- a/fe/src/main/java/org/apache/impala/catalog/metastore/CatalogMetastoreServiceHandler.java +++ b/fe/src/main/java/org/apache/impala/catalog/metastore/CatalogMetastoreServiceHandler.java @@ -23,7 +23,7 @@ import com.google.common.base.Preconditions; import java.util.List; import java.util.Map; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.hadoop.hive.metastore.api.AddPartitionsRequest; import org.apache.hadoop.hive.metastore.api.AddPartitionsResult; import org.apache.hadoop.hive.metastore.api.AlreadyExistsException; @@ -1273,7 +1273,7 @@ public class CatalogMetastoreServiceHandler extends MetastoreServiceHandler { String errMsg = String.format(SYNC_TABLE_LATEST_EVENT_ID_ERR_MSG, tbl.getFullName(), apiName); LOG.error("{}. Exception stacktrace: {} ", errMsg, - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); rethrowException(e, apiName); } } @@ -1298,7 +1298,7 @@ public class CatalogMetastoreServiceHandler extends MetastoreServiceHandler { String errMsg = String.format(SYNC_DB_LATEST_EVENT_ID_ERR_MSG, db.getName(), apiName); LOG.error("{}. Exception stacktrace: {} ", errMsg, - ExceptionUtils.getFullStackTrace(e)); + ExceptionUtils.getStackTrace(e)); rethrowException(e, apiName); } } diff --git a/fe/src/main/java/org/apache/impala/catalog/monitor/CatalogOperationCounter.java b/fe/src/main/java/org/apache/impala/catalog/monitor/CatalogOperationCounter.java index 6d2ddf176..fad1da65c 100644 --- a/fe/src/main/java/org/apache/impala/catalog/monitor/CatalogOperationCounter.java +++ b/fe/src/main/java/org/apache/impala/catalog/monitor/CatalogOperationCounter.java @@ -17,7 +17,7 @@ package org.apache.impala.catalog.monitor; -import org.apache.commons.lang.mutable.MutableLong; +import org.apache.commons.lang3.mutable.MutableLong; import org.apache.impala.thrift.TOperationUsageCounter; import org.apache.impala.thrift.TTableName; diff --git a/fe/src/main/java/org/apache/impala/common/JniUtil.java b/fe/src/main/java/org/apache/impala/common/JniUtil.java index bdf50f192..decefcc8e 100644 --- a/fe/src/main/java/org/apache/impala/common/JniUtil.java +++ b/fe/src/main/java/org/apache/impala/common/JniUtil.java @@ -33,7 +33,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.impala.service.BackendConfig; import org.apache.impala.thrift.TGetJMXJsonResponse; import org.apache.impala.util.JMXJsonUtil; diff --git a/fe/src/main/java/org/apache/impala/extdatasource/ExternalDataSourceExecutor.java b/fe/src/main/java/org/apache/impala/extdatasource/ExternalDataSourceExecutor.java index 8545567b0..a893bf7fe 100644 --- a/fe/src/main/java/org/apache/impala/extdatasource/ExternalDataSourceExecutor.java +++ b/fe/src/main/java/org/apache/impala/extdatasource/ExternalDataSourceExecutor.java @@ -24,7 +24,7 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.Map; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.apache.thrift.TException; import org.apache.thrift.TSerializer; import org.apache.thrift.protocol.TBinaryProtocol; diff --git a/fe/src/main/java/org/apache/impala/extdatasource/jdbc/JdbcDataSource.java b/fe/src/main/java/org/apache/impala/extdatasource/jdbc/JdbcDataSource.java index 065934d06..9a0230059 100644 --- a/fe/src/main/java/org/apache/impala/extdatasource/jdbc/JdbcDataSource.java +++ b/fe/src/main/java/org/apache/impala/extdatasource/jdbc/JdbcDataSource.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.UUID; import java.util.stream.Collectors; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.impala.extdatasource.jdbc.conf.JdbcStorageConfig; import org.apache.impala.extdatasource.jdbc.conf.JdbcStorageConfigManager; diff --git a/fe/src/main/java/org/apache/impala/hooks/QueryEventHookManager.java b/fe/src/main/java/org/apache/impala/hooks/QueryEventHookManager.java index b1e4d702d..9e3ea0fca 100644 --- a/fe/src/main/java/org/apache/impala/hooks/QueryEventHookManager.java +++ b/fe/src/main/java/org/apache/impala/hooks/QueryEventHookManager.java @@ -16,7 +16,7 @@ // under the License. package org.apache.impala.hooks; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.impala.common.InternalException; import org.apache.impala.service.BackendConfig; import org.apache.impala.thrift.TBackendGflags; diff --git a/fe/src/main/java/org/apache/impala/service/CatalogOpExecutor.java b/fe/src/main/java/org/apache/impala/service/CatalogOpExecutor.java index 923894cd9..32e2e33cd 100644 --- a/fe/src/main/java/org/apache/impala/service/CatalogOpExecutor.java +++ b/fe/src/main/java/org/apache/impala/service/CatalogOpExecutor.java @@ -3497,7 +3497,7 @@ public class CatalogOpExecutor { try { Database db = metastoreClient.getDatabase(dbName); if (!db.isSetParameters()) return false; - return org.apache.commons.lang.StringUtils + return org.apache.commons.lang3.StringUtils .isNotEmpty(db.getParameters().get("repl.source.for")); } catch (TException tException) { throw new CatalogException( diff --git a/fe/src/main/java/org/apache/impala/service/Frontend.java b/fe/src/main/java/org/apache/impala/service/Frontend.java index ae398128b..539d5dedd 100644 --- a/fe/src/main/java/org/apache/impala/service/Frontend.java +++ b/fe/src/main/java/org/apache/impala/service/Frontend.java @@ -55,7 +55,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; -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.hive.metastore.IMetaStoreClient; diff --git a/fe/src/main/java/org/apache/impala/service/JniFrontend.java b/fe/src/main/java/org/apache/impala/service/JniFrontend.java index 1e2938d2e..3a3e4d77f 100644 --- a/fe/src/main/java/org/apache/impala/service/JniFrontend.java +++ b/fe/src/main/java/org/apache/impala/service/JniFrontend.java @@ -21,7 +21,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.fs.CommonConfigurationKeys; diff --git a/fe/src/main/java/org/apache/impala/util/HiveMetadataFormatUtils.java b/fe/src/main/java/org/apache/impala/util/HiveMetadataFormatUtils.java index 4a9e2cea4..2afb69884 100644 --- a/fe/src/main/java/org/apache/impala/util/HiveMetadataFormatUtils.java +++ b/fe/src/main/java/org/apache/impala/util/HiveMetadataFormatUtils.java @@ -26,7 +26,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.TreeMap; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.text.translate.CharSequenceTranslator; import org.apache.commons.lang3.text.translate.EntityArrays; import org.apache.commons.lang3.text.translate.LookupTranslator; diff --git a/fe/src/main/java/org/apache/impala/util/JniRequestPoolService.java b/fe/src/main/java/org/apache/impala/util/JniRequestPoolService.java index 2036d9ec8..844c975f0 100644 --- a/fe/src/main/java/org/apache/impala/util/JniRequestPoolService.java +++ b/fe/src/main/java/org/apache/impala/util/JniRequestPoolService.java @@ -19,7 +19,7 @@ package org.apache.impala.util; import com.google.common.base.Preconditions; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.impala.common.ImpalaException; import org.apache.impala.common.InternalException; diff --git a/fe/src/test/java/org/apache/impala/authorization/AuthorizationStmtTest.java b/fe/src/test/java/org/apache/impala/authorization/AuthorizationStmtTest.java index a2e710f4b..e97b5a53b 100644 --- a/fe/src/test/java/org/apache/impala/authorization/AuthorizationStmtTest.java +++ b/fe/src/test/java/org/apache/impala/authorization/AuthorizationStmtTest.java @@ -20,7 +20,7 @@ package org.apache.impala.authorization; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.apache.impala.analysis.AnalysisContext; import org.apache.impala.analysis.AnalysisContext.AnalysisResult; import org.apache.impala.catalog.ScalarFunction; diff --git a/fe/src/test/java/org/apache/impala/catalog/events/MetastoreEventsProcessorTest.java b/fe/src/test/java/org/apache/impala/catalog/events/MetastoreEventsProcessorTest.java index e8621a075..a781ac985 100644 --- a/fe/src/test/java/org/apache/impala/catalog/events/MetastoreEventsProcessorTest.java +++ b/fe/src/test/java/org/apache/impala/catalog/events/MetastoreEventsProcessorTest.java @@ -44,7 +44,7 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileStatus; diff --git a/fe/src/test/java/org/apache/impala/customservice/KuduHMSIntegrationTest.java b/fe/src/test/java/org/apache/impala/customservice/KuduHMSIntegrationTest.java index a822079df..37a099429 100644 --- a/fe/src/test/java/org/apache/impala/customservice/KuduHMSIntegrationTest.java +++ b/fe/src/test/java/org/apache/impala/customservice/KuduHMSIntegrationTest.java @@ -18,7 +18,7 @@ package org.apache.impala.customservice; import static org.junit.Assert.assertEquals; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.impala.analysis.AnalyzeKuduDDLTest; import org.apache.impala.analysis.AuditingKuduTest; diff --git a/fe/src/test/java/org/apache/impala/planner/PlannerTestBase.java b/fe/src/test/java/org/apache/impala/planner/PlannerTestBase.java index 6648adc87..e90e8e7f3 100644 --- a/fe/src/test/java/org/apache/impala/planner/PlannerTestBase.java +++ b/fe/src/test/java/org/apache/impala/planner/PlannerTestBase.java @@ -32,7 +32,7 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.hadoop.fs.Path; import org.apache.impala.analysis.ColumnLineageGraph; import org.apache.impala.analysis.DescriptorTable; diff --git a/java/TableFlattener/pom.xml b/java/TableFlattener/pom.xml index 55027e896..b7d0d28d0 100644 --- a/java/TableFlattener/pom.xml +++ b/java/TableFlattener/pom.xml @@ -65,9 +65,8 @@ </exclusions> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>${commons-io.version}</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> </dependencies> </project> diff --git a/java/TableFlattener/src/main/java/org/apache/impala/infra/tableflattener/SchemaFlattener.java b/java/TableFlattener/src/main/java/org/apache/impala/infra/tableflattener/SchemaFlattener.java index 535626de1..c5d34b409 100644 --- a/java/TableFlattener/src/main/java/org/apache/impala/infra/tableflattener/SchemaFlattener.java +++ b/java/TableFlattener/src/main/java/org/apache/impala/infra/tableflattener/SchemaFlattener.java @@ -23,7 +23,7 @@ import org.apache.avro.Schema; import org.apache.avro.Schema.Field; import org.apache.avro.Schema.Type; import org.apache.avro.generic.GenericRecord; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.hadoop.conf.Configuration; import org.kitesdk.data.Dataset; import org.kitesdk.data.DatasetDescriptor; diff --git a/java/pom.xml b/java/pom.xml index 23e477c6c..ae5752532 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -58,7 +58,6 @@ under the License. <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <kudu.version>${env.IMPALA_KUDU_VERSION}</kudu.version> <slf4j.version>${env.IMPALA_SLF4J_VERSION}</slf4j.version> - <commons-io.version>${env.IMPALA_COMMONS_IO_VERSION}</commons-io.version> <commons-lang3.version>${env.IMPALA_COMMONS_LANG3_VERSION}</commons-lang3.version> <reload4j.version>${env.IMPALA_RELOAD4j_VERSION}</reload4j.version> <junit.version>${env.IMPALA_JUNIT_VERSION}</junit.version>
