ACCUMULO-4354 Update dependency versions Update bouncycastle, slf4j, curator, jetty, hadoop, powermock, easymock, jcommander, gson, commons-configuration, log4j, and commons-math (to commons-math3). Note: some were not bumped to the very latest, only the latest bugfix version which did not break the build (example: latest curator changes behavior, so it was only updated to version 2.11.0)
Update LICENSE and NOTICE for binary tarball assembly to reflect update to use Commons Math3. Add checkstyle rule to avoid use of transitive commons-math 2. Remove residual profiles from previous simultaneous support for hadoop 1 and 2. Default to hadoop 2.6.4 so Kerberos tests pass without additional command-line opts. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/609367fc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/609367fc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/609367fc Branch: refs/heads/1.8 Commit: 609367fc409d10f80921f456c7e2f8d4157192cc Parents: 104eeb3 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Jun 23 19:48:11 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Jun 23 19:48:11 2016 -0400 ---------------------------------------------------------------------- assemble/bin-LICENSE | 263 ++++++++++++------- assemble/bin-NOTICE | 53 +--- assemble/pom.xml | 2 +- assemble/src/main/assemblies/component.xml | 2 +- core/pom.xml | 2 +- .../accumulo/core/file/rfile/PrintInfo.java | 2 +- .../apache/accumulo/core/file/rfile/RFile.java | 2 +- .../org/apache/accumulo/core/util/Stat.java | 12 +- .../accumulo/fate/zookeeper/ZooCacheTest.java | 5 +- pom.xml | 75 ++---- test/pom.xml | 43 +-- .../test/randomwalk/concurrent/Config.java | 11 +- .../test/randomwalk/conditional/Transfer.java | 6 +- 13 files changed, 215 insertions(+), 263 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/609367fc/assemble/bin-LICENSE ---------------------------------------------------------------------- diff --git a/assemble/bin-LICENSE b/assemble/bin-LICENSE index 1e6d746..64cf0bd 100644 --- a/assemble/bin-LICENSE +++ b/assemble/bin-LICENSE @@ -201,6 +201,7 @@ See the License for the specific language governing permissions and limitations under the License. +---- APACHE ACCUMULO SUBCOMPONENTS: @@ -209,6 +210,8 @@ notices and license terms. Your use of the source code for the these subcomponents is subject to the terms and conditions of the following licenses. +---- + This product bundles software from the European Commission project OneLab (http://www.one-lab.org), @@ -217,7 +220,6 @@ This product bundles software from the European Commission project OneLab * Filter.java Copyright (c) 2005, European Commission project OneLab under contract 034819 - available under the following BSD 3-Clause style license: * Redistribution and use in source and binary forms, with or @@ -282,8 +284,8 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - ---- + This product bundles Flot, For details, see server/monitor/src/main/resources/web/flot/ @@ -310,8 +312,8 @@ distributed under the MIT license (see above) ---- -The binary distribution of this product bundles jline, which is available -under the following "3-clause BSD" license: +This product bundles jline, which is available under the following +"3-clause BSD" license: The BSD License @@ -348,47 +350,51 @@ under the following "3-clause BSD" license: IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -The distribution of this product bundles Apache Commons Math which -is available with the following license information: +---- + +This product bundles Apache Commons Math3 which is available with the following +additional license information: + + APACHE COMMONS MATH DERIVATIVE WORKS: The Apache commons-math library includes a number of subcomponents whose implementation is derived from original sources written in C or Fortran. License terms of the original sources are reproduced below. - + =============================================================================== For the lmder, lmpar and qrsolv Fortran routine from minpack and translated in the LevenbergMarquardtOptimizer class in package - org.apache.commons.math.optimization.general + org.apache.commons.math3.optimization.general Original source copyright and license statement: - + Minpack Copyright Notice (1999) University of Chicago. All rights reserved - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + 3. The end-user documentation included with the redistribution, if any, must include the following acknowledgment: - + "This product includes software developed by the University of Chicago, as Operator of Argonne National Laboratory. - + Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear. - + 4. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS" WITHOUT WARRANTY OF ANY KIND. THE COPYRIGHT HOLDER, THE UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND @@ -402,7 +408,7 @@ is available with the following license information: DO NOT WARRANT THAT THE SOFTWARE WILL FUNCTION UNINTERRUPTED, THAT IT IS ERROR-FREE OR THAT ANY ERRORS WILL BE CORRECTED. - + 5. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT HOLDER, THE UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT, @@ -414,101 +420,60 @@ is available with the following license information: EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE POSSIBILITY OF SUCH LOSS OR DAMAGES. =============================================================================== - + Copyright and license statement for the odex Fortran routine developed by E. Hairer and G. Wanner and translated in GraggBulirschStoerIntegrator class - in package org.apache.commons.math.ode.nonstiff: - - + in package org.apache.commons.math3.ode.nonstiff: + + Copyright (c) 2004, Ernst Hairer - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - =============================================================================== - - Copyright and license statement for the original lapack fortran routines - translated in EigenDecompositionImpl class in package - org.apache.commons.math.linear: - - Copyright (c) 1992-2008 The University of Tennessee. All rights reserved. - - $COPYRIGHT$ - - Additional copyrights may follow - - $HEADER$ - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - + notice, this list of conditions and the following disclaimer. + - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer listed - in this license in the documentation and/or other materials - provided with the distribution. - - - Neither the name of the copyright holders nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. =============================================================================== - + Copyright and license statement for the original Mersenne twister C - routines translated in MersenneTwister class in package - org.apache.commons.math.random: - + routines translated in MersenneTwister class in package + org.apache.commons.math3.random: + Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura, - All rights reserved. - + All rights reserved. + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - - 3. The names of its contributors may not be used to endorse or promote - products derived from this software without specific prior written + + 3. The names of its contributors may not be used to endorse or promote + products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -521,10 +486,110 @@ is available with the following license information: NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ----------- + =============================================================================== + + The initial code for shuffling an array (originally in class + "org.apache.commons.math3.random.RandomDataGenerator", now replaced by + a method in class "org.apache.commons.math3.util.MathArrays") was + inspired from the algorithm description provided in + "Algorithms", by Ian Craw and John Pulham (University of Aberdeen 1999). + The textbook (containing a proof that the shuffle is uniformly random) is + available here: + http://citeseerx.ist.psu.edu/viewdoc/download;?doi=10.1.1.173.1898&rep=rep1&type=pdf + + =============================================================================== + License statement for the direction numbers in the resource files for Sobol sequences. + + ----------------------------------------------------------------------------- + Licence pertaining to sobol.cc and the accompanying sets of direction numbers + + ----------------------------------------------------------------------------- + Copyright (c) 2008, Frances Y. Kuo and Stephen Joe + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the names of the copyright holders nor the names of the + University of New South Wales and the University of Waikato + and its contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + =============================================================================== + + The initial commit of package "org.apache.commons.math3.ml.neuralnet" is + an adapted version of code developed in the context of the Data Processing + and Analysis Consortium (DPAC) of the "Gaia" project of the European Space + Agency (ESA). + =============================================================================== + + The initial commit of the class "org.apache.commons.math3.special.BesselJ" is + an adapted version of code translated from the netlib Fortran program, rjbesl + http://www.netlib.org/specfun/rjbesl by R.J. Cody at Argonne National + Laboratory (USA). There is no license or copyright statement included with the + original Fortran sources. + =============================================================================== + + The BracketFinder (package org.apache.commons.math3.optimization.univariate) + and PowellOptimizer (package org.apache.commons.math3.optimization.general) + classes are based on the Python code in module "optimize.py" (version 0.5) + developed by Travis E. Oliphant for the SciPy library (http://www.scipy.org/) + Copyright © 2003-2009 SciPy Developers. -The binary distribution of this product bundles Protocol Buffers, which is available -under the following "3-clause BSD" license: + SciPy license + Copyright © 2001, 2002 Enthought, Inc. + All rights reserved. + + Copyright © 2003-2013 SciPy Developers. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of Enthought nor the names of the SciPy Developers may + be used to endorse or promote products derived from this software without + specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS âAS ISâ AND ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + =============================================================================== + +---- + +This product bundles Protocol Buffers, which is available under the following +"3-clause BSD" license: Copyright 2014, Google Inc. All rights reserved. @@ -561,10 +626,10 @@ under the following "3-clause BSD" license: standalone and requires a support library to be linked with it. This support library is itself covered by the above license. ---------- +---- -This distribution of this product bundles slf4j, which is available -under the following MIT license: +This distribution of this product bundles slf4j, which is available under the +following MIT license: Copyright (c) 2004-2013 QOS.ch All rights reserved. @@ -588,7 +653,7 @@ under the following MIT license: OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------- +---- The binary distribution of the product bundles javax.servlet-api, which is available under the CDDL 1.0 license (http://servlet-spec.java.net). http://git-wip-us.apache.org/repos/asf/accumulo/blob/609367fc/assemble/bin-NOTICE ---------------------------------------------------------------------- diff --git a/assemble/bin-NOTICE b/assemble/bin-NOTICE index 07d574b..841f83e 100644 --- a/assemble/bin-NOTICE +++ b/assemble/bin-NOTICE @@ -7,53 +7,12 @@ The Apache Software Foundation (http://www.apache.org/). This product includes JCommander (https://github.com/cbeust/jcommander), Copyright 2010 Cedric Beust ced...@beust.com. -This product includes the Apache Thrift libthrift JAR file. -Copyright 2006-2010 The Apache Software Foundation. - -This product includes Apache Commons-VFS (https://commons.apache.org/proper/commons-vfs/). -Copyright 2002-2015 The Apache Software Foundation. - -This product includes Apache Commons-Math (https://commons.apache.org/proper/commons-vfs/). -Copyright 2001-2010 The Apache Software Foundation - - =============================================================================== - The LinearConstraint, LinearObjectiveFunction, LinearOptimizer, - RelationShip, SimplexSolver and SimplexTableau classes in package - org.apache.commons.math.optimization.linear include software developed by - Benjamin McCann (http://www.benmccann.com) and distributed with - the following copyright: Copyright 2009 Google Inc. - =============================================================================== - - This product includes software developed by the - University of Chicago, as Operator of Argonne National - Laboratory. - The LevenbergMarquardtOptimizer class in package - org.apache.commons.math.optimization.general includes software - translated from the lmder, lmpar and qrsolv Fortran routines - from the Minpack package - Minpack Copyright Notice (1999) University of Chicago. All rights reserved - =============================================================================== - - The GraggBulirschStoerIntegrator class in package - org.apache.commons.math.ode.nonstiff includes software translated - from the odex Fortran routine developed by E. Hairer and G. Wanner. - Original source copyright: - Copyright (c) 2004, Ernst Hairer - =============================================================================== +This product includes Jetty (http://eclipse.org/jetty) +Copyright 1996-2009 Mort Bay Consulting Pty. Ltd. - The EigenDecompositionImpl class in package - org.apache.commons.math.linear includes software translated - from some LAPACK Fortran routines. Original source copyright: - Copyright (c) 1992-2008 The University of Tennessee. All rights reserved. - =============================================================================== +From Apache Commons Math3: - The MersenneTwister class in package org.apache.commons.math.random - includes software translated from the 2002-01-26 version of - the Mersenne-Twister generator written in C by Makoto Matsumoto and Takuji - Nishimura. Original source copyright: - Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura, - All rights reserved - =============================================================================== + This product includes software developed for Orekit by + CS Systèmes d'Information (http://www.c-s.fr/) + Copyright 2010-2012 CS Systèmes d'Information -This product includes Jetty (http://eclipse.org/jetty) -Copyright 1996-2009 Mort Bay Consulting Pty. Ltd. http://git-wip-us.apache.org/repos/asf/accumulo/blob/609367fc/assemble/pom.xml ---------------------------------------------------------------------- diff --git a/assemble/pom.xml b/assemble/pom.xml index 9803dfa..8355648 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -122,7 +122,7 @@ </dependency> <dependency> <groupId>org.apache.commons</groupId> - <artifactId>commons-math</artifactId> + <artifactId>commons-math3</artifactId> </dependency> <dependency> <groupId>org.apache.commons</groupId> http://git-wip-us.apache.org/repos/asf/accumulo/blob/609367fc/assemble/src/main/assemblies/component.xml ---------------------------------------------------------------------- diff --git a/assemble/src/main/assemblies/component.xml b/assemble/src/main/assemblies/component.xml index 22a5c22..c93af55 100644 --- a/assemble/src/main/assemblies/component.xml +++ b/assemble/src/main/assemblies/component.xml @@ -36,7 +36,7 @@ <include>com.google.protobuf:protobuf-java</include> <include>javax.servlet:javax.servlet-api</include> <include>jline:jline</include> - <include>org.apache.commons:commons-math</include> + <include>org.apache.commons:commons-math3</include> <include>org.apache.commons:commons-vfs2</include> <include>org.apache.thrift:libthrift</include> <include>org.eclipse.jetty:jetty-http</include> http://git-wip-us.apache.org/repos/asf/accumulo/blob/609367fc/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index b412933..fd51e38 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -81,7 +81,7 @@ </dependency> <dependency> <groupId>org.apache.commons</groupId> - <artifactId>commons-math</artifactId> + <artifactId>commons-math3</artifactId> </dependency> <dependency> <groupId>org.apache.commons</groupId> http://git-wip-us.apache.org/repos/asf/accumulo/blob/609367fc/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java index e166557..1d4e055 100644 --- a/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java +++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java @@ -32,7 +32,7 @@ import org.apache.accumulo.core.file.FileSKVIterator; import org.apache.accumulo.core.file.blockfile.impl.CachableBlockFile; import org.apache.accumulo.core.file.rfile.RFile.Reader; import org.apache.accumulo.start.spi.KeywordExecutable; -import org.apache.commons.math.stat.descriptive.SummaryStatistics; +import org.apache.commons.math3.stat.descriptive.SummaryStatistics; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; http://git-wip-us.apache.org/repos/asf/accumulo/blob/609367fc/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java index f6269e7..ac5cde7 100644 --- a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java +++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java @@ -70,7 +70,7 @@ import org.apache.accumulo.core.iterators.system.LocalityGroupIterator.LocalityG import org.apache.accumulo.core.sample.impl.SamplerConfigurationImpl; import org.apache.accumulo.core.util.MutableByteSequence; import org.apache.commons.lang.mutable.MutableLong; -import org.apache.commons.math.stat.descriptive.SummaryStatistics; +import org.apache.commons.math3.stat.descriptive.SummaryStatistics; import org.apache.hadoop.io.Writable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/accumulo/blob/609367fc/core/src/main/java/org/apache/accumulo/core/util/Stat.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/Stat.java b/core/src/main/java/org/apache/accumulo/core/util/Stat.java index b7d4165..8bdeb63 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/Stat.java +++ b/core/src/main/java/org/apache/accumulo/core/util/Stat.java @@ -16,12 +16,12 @@ */ package org.apache.accumulo.core.util; -import org.apache.commons.math.stat.descriptive.StorelessUnivariateStatistic; -import org.apache.commons.math.stat.descriptive.moment.Mean; -import org.apache.commons.math.stat.descriptive.moment.StandardDeviation; -import org.apache.commons.math.stat.descriptive.rank.Max; -import org.apache.commons.math.stat.descriptive.rank.Min; -import org.apache.commons.math.stat.descriptive.summary.Sum; +import org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatistic; +import org.apache.commons.math3.stat.descriptive.moment.Mean; +import org.apache.commons.math3.stat.descriptive.moment.StandardDeviation; +import org.apache.commons.math3.stat.descriptive.rank.Max; +import org.apache.commons.math3.stat.descriptive.rank.Min; +import org.apache.commons.math3.stat.descriptive.summary.Sum; public class Stat { Min min; http://git-wip-us.apache.org/repos/asf/accumulo/blob/609367fc/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooCacheTest.java ---------------------------------------------------------------------- diff --git a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooCacheTest.java b/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooCacheTest.java index 5dd6f61..6c35ed1 100644 --- a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooCacheTest.java +++ b/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooCacheTest.java @@ -40,6 +40,7 @@ import org.apache.zookeeper.Watcher; import org.apache.zookeeper.ZooKeeper; import org.apache.zookeeper.data.Stat; import org.easymock.Capture; +import org.easymock.EasyMock; import org.junit.Before; import org.junit.Test; @@ -266,7 +267,7 @@ public class ZooCacheTest { } private Watcher watchData(byte[] initialData) throws Exception { - Capture<Watcher> cw = new Capture<Watcher>(); + Capture<Watcher> cw = EasyMock.newCapture(); Stat existsStat = new Stat(); if (initialData != null) { expect(zk.exists(eq(ZPATH), capture(cw))).andReturn(existsStat); @@ -335,7 +336,7 @@ public class ZooCacheTest { } private Watcher watchChildren(List<String> initialChildren) throws Exception { - Capture<Watcher> cw = new Capture<Watcher>(); + Capture<Watcher> cw = EasyMock.newCapture(); expect(zk.getChildren(eq(ZPATH), capture(cw))).andReturn(initialChildren); replay(zk); zc.getChildren(ZPATH); http://git-wip-us.apache.org/repos/asf/accumulo/blob/609367fc/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a24598b..467bd2b 100644 --- a/pom.xml +++ b/pom.xml @@ -122,9 +122,9 @@ <accumulo.release.version>${project.version}</accumulo.release.version> <assembly.tarLongFileMode>posix</assembly.tarLongFileMode> <!-- bouncycastle version for test dependencies --> - <bouncycastle.version>1.50</bouncycastle.version> + <bouncycastle.version>1.54</bouncycastle.version> <!-- Curator version --> - <curator.version>2.7.1</curator.version> + <curator.version>2.11.0</curator.version> <!-- relative path for Eclipse format; should override in child modules if necessary --> <eclipseFormatterStyle>${project.parent.basedir}/contrib/Eclipse-Accumulo-Codestyle.xml</eclipseFormatterStyle> <!-- extra release args for testing --> @@ -133,23 +133,22 @@ <findbugs.version>3.0.3</findbugs.version> <!-- surefire/failsafe plugin option --> <forkCount>1</forkCount> - <!-- overwritten in hadoop profiles --> - <hadoop.version>2.2.0</hadoop.version> + <hadoop.version>2.6.4</hadoop.version> <htrace.version>3.1.0-incubating</htrace.version> <httpclient.version>3.1</httpclient.version> <it.failIfNoSpecifiedTests>false</it.failIfNoSpecifiedTests> - <jetty.version>9.1.5.v20140505</jetty.version> + <!-- jetty 9.2 is the last version to support jdk less than 1.8 --> + <jetty.version>9.2.17.v20160517</jetty.version> <maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.target>1.7</maven.compiler.target> <!-- the maven-release-plugin makes this recommendation, due to plugin bugs --> <maven.min-version>3.0.5</maven.min-version> <!-- surefire/failsafe plugin option --> <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile> - <powermock.version>1.6.4</powermock.version> + <powermock.version>1.6.5</powermock.version> <!-- surefire/failsafe plugin option --> <reuseForks>false</reuseForks> - <!-- overwritten in hadoop profiles --> - <slf4j.version>1.7.5</slf4j.version> + <slf4j.version>1.7.21</slf4j.version> <sourceReleaseAssemblyDescriptor>source-release-tar</sourceReleaseAssemblyDescriptor> <surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests> <!-- Thrift version --> @@ -162,7 +161,7 @@ <dependency> <groupId>com.beust</groupId> <artifactId>jcommander</artifactId> - <version>1.32</version> + <version>1.48</version> </dependency> <dependency> <groupId>com.google.auto.service</groupId> @@ -172,7 +171,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.2.4</version> + <version>2.7</version> </dependency> <!-- Hadoop-2.4.0 MiniDFSCluster uses classes dropped in Guava 15 --> <dependency> @@ -204,7 +203,7 @@ <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> - <version>1.6</version> + <version>1.10</version> </dependency> <dependency> <groupId>commons-httpclient</groupId> @@ -249,7 +248,7 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.16</version> + <version>1.2.17</version> </dependency> <dependency> <groupId>org.apache.accumulo</groupId> @@ -372,8 +371,8 @@ </dependency> <dependency> <groupId>org.apache.commons</groupId> - <artifactId>commons-math</artifactId> - <version>2.1</version> + <artifactId>commons-math3</artifactId> + <version>3.6.1</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -488,7 +487,7 @@ <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> - <version>3.1</version> + <version>3.4</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> @@ -774,12 +773,6 @@ <requireMavenVersion> <version>[${maven.min-version},)</version> </requireMavenVersion> - <requireProperty> - <property>hadoop.profile</property> - <regex>(2)</regex> - <regexMessage>You should specify the Hadoop profile by major Hadoop generation, i.e. 1 or 2, not by a version number. - Use hadoop.version to use a particular Hadoop version within that generation. See README for more details.</regexMessage> - </requireProperty> </rules> </configuration> </plugin> @@ -904,6 +897,10 @@ <property name="format" value="jline[.]internal[.]Preconditions" /> <property name="message" value="Please use Guava Preconditions not JLine" /> </module> + <module name="RegexpSinglelineJava"> + <property name="format" value="org[.]apache[.]commons[.]math[.]" /> + <property name="message" value="Use commons-math3 (org.apache.commons.math3.*)" /> + </module> <module name="OuterTypeFilename" /> <module name="LineLength"> <!-- needs extra, because Eclipse formatter ignores the ending left brace --> @@ -1315,42 +1312,6 @@ <it.test>ReadWriteIT,SimpleProxyIT,ExamplesIT,ShellServerIT</it.test> </properties> </profile> - <!-- profile for our default Hadoop build - unfortunately, has to duplicate one of our - specified profiles. see MNG-3328 --> - <profile> - <id>hadoop-default</id> - <activation> - <property> - <name>!hadoop.profile</name> - </property> - </activation> - <properties> - <!-- Denotes intention and allows the enforcer plugin to pass when - the user is relying on default behavior; won't work to activate profile --> - <hadoop.profile>2</hadoop.profile> - <hadoop.version>2.2.0</hadoop.version> - <httpclient.version>3.1</httpclient.version> - <slf4j.version>1.7.5</slf4j.version> - </properties> - </profile> - <!-- profile for building against Hadoop 2.x - XXX Since this is the default, make sure to sync hadoop-default when changing. - Activate using: mvn -Dhadoop.profile=2 --> - <profile> - <id>hadoop-2</id> - <activation> - <property> - <name>hadoop.profile</name> - <value>2</value> - </property> - </activation> - <properties> - <hadoop.version>2.2.0</hadoop.version> - <httpclient.version>3.1</httpclient.version> - <slf4j.version>1.7.5</slf4j.version> - </properties> - </profile> <profile> <id>jdk8</id> <activation> http://git-wip-us.apache.org/repos/asf/accumulo/blob/609367fc/test/pom.xml ---------------------------------------------------------------------- diff --git a/test/pom.xml b/test/pom.xml index ea2e374..c9fb316 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -141,7 +141,7 @@ </dependency> <dependency> <groupId>org.apache.commons</groupId> - <artifactId>commons-math</artifactId> + <artifactId>commons-math3</artifactId> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -149,6 +149,10 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-distcp</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> </dependency> <dependency> @@ -340,43 +344,6 @@ </build> </profile> <profile> - <id>hadoop-default</id> - <activation> - <property> - <name>!hadoop.profile</name> - </property> - </activation> - <properties> - <!-- Denotes intention and allows the enforcer plugin to pass when - the user is relying on default behavior; won't work to activate profile --> - <hadoop.profile>2</hadoop.profile> - </properties> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-distcp</artifactId> - </dependency> - </dependencies> - </profile> - <!-- profile for building against Hadoop 2.x - XXX Since this is the default, make sure to sync hadoop-default when changing. - Activate using: mvn -Dhadoop.profile=2 --> - <profile> - <id>hadoop-2</id> - <activation> - <property> - <name>hadoop.profile</name> - <value>2</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-distcp</artifactId> - </dependency> - </dependencies> - </profile> - <profile> <!-- create shaded test jar appropriate for running ITs on MapReduce --> <id>mrit</id> <activation> http://git-wip-us.apache.org/repos/asf/accumulo/blob/609367fc/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java index 7e95d3b..b05e08c 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java @@ -26,8 +26,7 @@ import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.test.randomwalk.Environment; import org.apache.accumulo.test.randomwalk.State; import org.apache.accumulo.test.randomwalk.Test; -import org.apache.commons.math.random.RandomData; -import org.apache.commons.math.random.RandomDataImpl; +import org.apache.commons.math3.random.RandomDataGenerator; public class Config extends Test { @@ -157,7 +156,7 @@ public class Config extends Test { state.remove(LAST_SETTING); state.remove(LAST_TABLE_SETTING); state.remove(LAST_NAMESPACE_SETTING); - RandomData random = new RandomDataImpl(); + RandomDataGenerator random = new RandomDataGenerator(); int dice = random.nextInt(0, 2); if (dice == 0) { changeTableSetting(random, state, env, props); @@ -168,7 +167,7 @@ public class Config extends Test { } } - private void changeTableSetting(RandomData random, State state, Environment env, Properties props) throws Exception { + private void changeTableSetting(RandomDataGenerator random, State state, Environment env, Properties props) throws Exception { // pick a random property int choice = random.nextInt(0, tableSettings.length - 1); Setting setting = tableSettings[choice]; @@ -195,7 +194,7 @@ public class Config extends Test { } } - private void changeNamespaceSetting(RandomData random, State state, Environment env, Properties props) throws Exception { + private void changeNamespaceSetting(RandomDataGenerator random, State state, Environment env, Properties props) throws Exception { // pick a random property int choice = random.nextInt(0, tableSettings.length - 1); Setting setting = tableSettings[choice]; @@ -222,7 +221,7 @@ public class Config extends Test { } } - private void changeSetting(RandomData random, State state, Environment env, Properties props) throws Exception { + private void changeSetting(RandomDataGenerator random, State state, Environment env, Properties props) throws Exception { // pick a random property int choice = random.nextInt(0, settings.length - 1); Setting setting = settings[choice]; http://git-wip-us.apache.org/repos/asf/accumulo/blob/609367fc/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Transfer.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Transfer.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Transfer.java index 2f3aacd..da30df5 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Transfer.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Transfer.java @@ -34,7 +34,7 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.test.randomwalk.Environment; import org.apache.accumulo.test.randomwalk.State; import org.apache.accumulo.test.randomwalk.Test; -import org.apache.commons.math.distribution.ZipfDistributionImpl; +import org.apache.commons.math3.distribution.ZipfDistribution; import org.apache.hadoop.io.Text; /** @@ -69,9 +69,9 @@ public class Transfer extends Test { int numAccts = (Integer) state.get("numAccts"); // note: non integer exponents are slow - ZipfDistributionImpl zdiBanks = new ZipfDistributionImpl((Integer) state.get("numBanks"), 1); + ZipfDistribution zdiBanks = new ZipfDistribution((Integer) state.get("numBanks"), 1); String bank = Utils.getBank(zdiBanks.inverseCumulativeProbability(rand.nextDouble())); - ZipfDistributionImpl zdiAccts = new ZipfDistributionImpl(numAccts, 1); + ZipfDistribution zdiAccts = new ZipfDistribution(numAccts, 1); String acct1 = Utils.getAccount(zdiAccts.inverseCumulativeProbability(rand.nextDouble())); String acct2 = Utils.getAccount(zdiAccts.inverseCumulativeProbability(rand.nextDouble())); while (acct2.equals(acct1)) {
