You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2018/04/20 13:45:36 UTC
[3/6] hbase git commit: HBASE-20440 Clean up incorrect use of
commons-lang 2.y
HBASE-20440 Clean up incorrect use of commons-lang 2.y
Signed-off-by: Umesh Agashe <ua...@cloudera.com>
Signed-off-by: Yu Li <li...@apache.org>
Conflicts:
hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/FileArchiverNotifierFactoryImpl.java
hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/FileArchiverNotifierImpl.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9740168f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9740168f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9740168f
Branch: refs/heads/branch-2
Commit: 9740168fa8fce1f5bfe7e6ad4ee46f1757761256
Parents: 944ecc7
Author: Sean Busbey <bu...@apache.org>
Authored: Tue Apr 17 15:21:49 2018 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Fri Apr 20 08:17:22 2018 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/net/Address.java | 2 +-
.../hadoop/hbase/regionserver/TestHdfsSnapshotHRegion.java | 2 +-
.../hadoop/hbase/util/compaction/TestMajorCompactionRequest.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/9740168f/hbase-common/src/main/java/org/apache/hadoop/hbase/net/Address.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/net/Address.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/net/Address.java
index 9d7f65c..ab7fa3b 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/net/Address.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/net/Address.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hbase.net;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hbase.thirdparty.com.google.common.net.HostAndPort;
http://git-wip-us.apache.org/repos/asf/hbase/blob/9740168f/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHdfsSnapshotHRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHdfsSnapshotHRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHdfsSnapshotHRegion.java
index feea086..6c20b5b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHdfsSnapshotHRegion.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHdfsSnapshotHRegion.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.hbase.regionserver;
import java.io.IOException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
http://git-wip-us.apache.org/repos/asf/hbase/blob/9740168f/hbase-server/src/test/java/org/apache/hadoop/hbase/util/compaction/TestMajorCompactionRequest.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/compaction/TestMajorCompactionRequest.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/compaction/TestMajorCompactionRequest.java
index b626481..adecd5c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/compaction/TestMajorCompactionRequest.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/compaction/TestMajorCompactionRequest.java
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
@@ -167,4 +167,4 @@ public class TestMajorCompactionRequest {
doReturn(mock(Connection.class)).when(spy).getConnection(eq(configuration));
return spy;
}
-}
\ No newline at end of file
+}