From 5c00c0ebda72f4970df42f6242e3a59f2ba48e27 Mon Sep 17 00:00:00 2001 From: Peter Somogyi Date: Fri, 25 Aug 2017 13:34:03 +0200 Subject: [PATCH] Upgrade hbase to commons-math 3 Upgrade commons-math:2.2 to commons-math3:3.6.1 Add jersey-client dependency to hbase-it module --- hbase-hadoop-compat/pom.xml | 2 +- hbase-hadoop2-compat/pom.xml | 2 +- hbase-it/pom.xml | 7 ++++++- .../java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java | 2 +- hbase-server/pom.xml | 2 +- .../java/org/apache/hadoop/hbase/HFilePerformanceEvaluation.java | 4 ++-- .../hbase/regionserver/compactions/GaussianFileListGenerator.java | 4 ++-- hbase-spark-it/pom.xml | 2 +- hbase-thrift/pom.xml | 2 +- pom.xml | 4 ++-- 10 files changed, 18 insertions(+), 13 deletions(-) diff --git a/hbase-hadoop-compat/pom.xml b/hbase-hadoop-compat/pom.xml index a027e5a762..253e77d2c6 100644 --- a/hbase-hadoop-compat/pom.xml +++ b/hbase-hadoop-compat/pom.xml @@ -106,7 +106,7 @@ org.apache.commons - commons-math + commons-math3 org.apache.hbase diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml index 735b27244a..9073175ea6 100644 --- a/hbase-hadoop2-compat/pom.xml +++ b/hbase-hadoop2-compat/pom.xml @@ -162,7 +162,7 @@ limitations under the License. org.apache.commons - commons-math + commons-math3 org.apache.hadoop diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index b9b12a435d..445d8e1660 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -254,7 +254,7 @@ org.apache.commons - commons-math + commons-math3 commons-lang @@ -269,6 +269,11 @@ javax.ws.rs-api test + + org.glassfish.jersey.core + jersey-client + ${jersey.version} + io.netty diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java index 272af96a9e..f7b67e2be4 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.commons.math.stat.descriptive.DescriptiveStatistics; +import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; import org.apache.hadoop.hbase.ClusterStatus; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index e1ef88234f..a6cb450d82 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -512,7 +512,7 @@ org.apache.commons - commons-math + commons-math3 log4j diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HFilePerformanceEvaluation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HFilePerformanceEvaluation.java index 37ca56bee9..db3e2cd4fd 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HFilePerformanceEvaluation.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HFilePerformanceEvaluation.java @@ -24,8 +24,8 @@ import java.util.Random; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.commons.math.random.RandomData; -import org.apache.commons.math.random.RandomDataImpl; +import org.apache.commons.math3.random.RandomData; +import org.apache.commons.math3.random.RandomDataImpl; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/GaussianFileListGenerator.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/GaussianFileListGenerator.java index fb8c30a3ff..a2964fff18 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/GaussianFileListGenerator.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/GaussianFileListGenerator.java @@ -22,8 +22,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.commons.math.random.GaussianRandomGenerator; -import org.apache.commons.math.random.MersenneTwister; +import org.apache.commons.math3.random.GaussianRandomGenerator; +import org.apache.commons.math3.random.MersenneTwister; import org.apache.hadoop.hbase.regionserver.StoreFile; class GaussianFileListGenerator extends StoreFileListGenerator { diff --git a/hbase-spark-it/pom.xml b/hbase-spark-it/pom.xml index f1f5e440eb..d994a96b0d 100644 --- a/hbase-spark-it/pom.xml +++ b/hbase-spark-it/pom.xml @@ -264,7 +264,7 @@ org.apache.commons - commons-math + commons-math3 commons-lang diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index 9d7a4b5b03..554845e606 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -236,7 +236,7 @@ org.apache.commons - commons-math + commons-math3 commons-lang diff --git a/pom.xml b/pom.xml index 464d42f21a..0eddbf4f53 100755 --- a/pom.xml +++ b/pom.xml @@ -1383,7 +1383,7 @@ 2.5 2.6 1.2 - 2.2 + 3.6.1 3.3.6 3.2.2 @@ -1793,7 +1793,7 @@ org.apache.commons - commons-math + commons-math3 ${commons-math.version} -- 2.13.1