diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 6fd5c4be0f..e66610b04d 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -375,6 +375,9 @@ Release 2.3.0 - UNRELEASED HADOOP-10064. Upgrade to maven antrun plugin version 1.7 (Arpit Agarwal via jeagles) + HADOOP-9594. Update apache commons math dependency (Timothy St. Clair via + stevel) + OPTIMIZATIONS HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn) diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 939ce20094..6c81e30bd5 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -55,7 +55,7 @@ org.apache.commons - commons-math + commons-math3 compile diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java index 259d329c4b..e386ce608f 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java @@ -38,7 +38,7 @@ import org.apache.commons.configuration.PropertiesConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.commons.math.util.MathUtils; +import org.apache.commons.math3.util.ArithmeticUtils; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.metrics2.MetricsInfo; import org.apache.hadoop.metrics2.MetricsCollector; @@ -457,7 +457,7 @@ private synchronized void configureSinks() { MetricsConfig conf = entry.getValue(); int sinkPeriod = conf.getInt(PERIOD_KEY, PERIOD_DEFAULT); confPeriod = confPeriod == 0 ? sinkPeriod - : MathUtils.gcd(confPeriod, sinkPeriod); + : ArithmeticUtils.gcd(confPeriod, sinkPeriod); String clsName = conf.getClassName(""); if (clsName == null) continue; // sink can be registered later on String sinkName = entry.getKey(); diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index a531e543bf..5a1e3f8359 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -324,8 +324,8 @@ org.apache.commons - commons-math - 2.1 + commons-math3 + 3.1.1 org.apache.commons