Repository: hbase Updated Branches: refs/heads/master a2b110e0f -> ea1620ff4
http://git-wip-us.apache.org/repos/asf/hbase/blob/5dacc851/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedUpdater.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedUpdater.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedUpdater.java index febc82b..0cc4143 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedUpdater.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedUpdater.java @@ -29,7 +29,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.math.RandomUtils; +import org.apache.commons.lang3.RandomUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; @@ -139,7 +139,7 @@ public class MultiThreadedUpdater extends MultiThreadedWriterBase { StringBuilder buf = new StringBuilder(); byte[][] columnFamilies = dataGenerator.getColumnFamilies(); while ((rowKeyBase = getNextKeyToUpdate()) < endKey) { - if (RandomUtils.nextInt(100) < updatePercent) { + if (RandomUtils.nextInt(0, 100) < updatePercent) { byte[] rowKey = dataGenerator.getDeterministicUniqueKey(rowKeyBase); Increment inc = new Increment(rowKey); Append app = new Append(rowKey); @@ -189,7 +189,7 @@ public class MultiThreadedUpdater extends MultiThreadedWriterBase { continue; } MutationType mt = MutationType - .valueOf(RandomUtils.nextInt(MutationType.values().length)); + .valueOf(RandomUtils.nextInt(0, MutationType.values().length)); long columnHash = Arrays.hashCode(column); long hashCode = cfHash + columnHash; byte[] hashCodeBytes = Bytes.toBytes(hashCode); http://git-wip-us.apache.org/repos/asf/hbase/blob/5dacc851/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java index 0c5b980..19e048c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java @@ -27,7 +27,7 @@ import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; -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.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/hbase/blob/5dacc851/hbase-shaded/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml index 25f3c59..a186d08 100644 --- a/hbase-shaded/pom.xml +++ b/hbase-shaded/pom.xml @@ -289,8 +289,8 @@ <shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.net</shadedPattern> </relocation> <relocation> - <pattern>org.apache.commons.lang</pattern> - <shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.lang</shadedPattern> + <pattern>org.apache.commons.lang3</pattern> + <shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.lang3</shadedPattern> </relocation> <relocation> <pattern>org.apache.commons.el</pattern> http://git-wip-us.apache.org/repos/asf/hbase/blob/5dacc851/hbase-spark-it/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-spark-it/pom.xml b/hbase-spark-it/pom.xml index f1f5e44..f3b2088 100644 --- a/hbase-spark-it/pom.xml +++ b/hbase-spark-it/pom.xml @@ -267,8 +267,8 @@ <artifactId>commons-math</artifactId> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> <groupId>org.apache.htrace</groupId> http://git-wip-us.apache.org/repos/asf/hbase/blob/5dacc851/hbase-spark-it/src/test/java/org/apache/hadoop/hbase/spark/IntegrationTestSparkBulkLoad.java ---------------------------------------------------------------------- diff --git a/hbase-spark-it/src/test/java/org/apache/hadoop/hbase/spark/IntegrationTestSparkBulkLoad.java b/hbase-spark-it/src/test/java/org/apache/hadoop/hbase/spark/IntegrationTestSparkBulkLoad.java index f45c0b9..76bfcd5 100644 --- a/hbase-spark-it/src/test/java/org/apache/hadoop/hbase/spark/IntegrationTestSparkBulkLoad.java +++ b/hbase-spark-it/src/test/java/org/apache/hadoop/hbase/spark/IntegrationTestSparkBulkLoad.java @@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.spark; import com.google.common.collect.Sets; import org.apache.commons.cli.CommandLine; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/hbase/blob/5dacc851/hbase-thrift/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index 9d7a4b5..84d204d 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -239,8 +239,8 @@ <artifactId>commons-math</artifactId> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> <groupId>org.apache.hbase</groupId> http://git-wip-us.apache.org/repos/asf/hbase/blob/5dacc851/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java index 476d3b1..0b6e230 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java @@ -48,7 +48,7 @@ import javax.security.sasl.SaslServer; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; import org.apache.commons.cli.OptionGroup; -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.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/hbase/blob/5dacc851/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 370166b..86342fd 100755 --- a/pom.xml +++ b/pom.xml @@ -1382,7 +1382,7 @@ <commons-codec.version>1.10</commons-codec.version> <!-- pretty outdated --> <commons-io.version>2.5</commons-io.version> - <commons-lang.version>2.6</commons-lang.version> + <commons-lang3.version>3.6</commons-lang3.version> <commons-logging.version>1.2</commons-logging.version> <commons-math.version>2.2</commons-math.version> <disruptor.version>3.3.6</disruptor.version> @@ -1795,9 +1795,9 @@ <version>${commons-io.version}</version> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>${commons-lang.version}</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${commons-lang3.version}</version> </dependency> <dependency> <groupId>commons-logging</groupId> http://git-wip-us.apache.org/repos/asf/hbase/blob/5dacc851/src/main/asciidoc/_chapters/configuration.adoc ---------------------------------------------------------------------- diff --git a/src/main/asciidoc/_chapters/configuration.adoc b/src/main/asciidoc/_chapters/configuration.adoc index bf14d11..23d1f8f 100644 --- a/src/main/asciidoc/_chapters/configuration.adoc +++ b/src/main/asciidoc/_chapters/configuration.adoc @@ -551,7 +551,7 @@ Minimally, an HBase client needs several libraries in its `CLASSPATH` when conne ---- commons-configuration (commons-configuration-1.6.jar) -commons-lang (commons-lang-2.5.jar) +commons-lang3 (commons-lang3-3.6.jar) commons-logging (commons-logging-1.1.1.jar) hadoop-core (hadoop-core-1.0.0.jar) hbase (hbase-0.92.0.jar)
