You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2016/07/21 22:48:57 UTC

[01/18] accumulo git commit: ACCUMULO-4382 Clean up license/notice files

Repository: accumulo
Updated Branches:
  refs/heads/1.6 a8d1acd4b -> 0fdd52a71
  refs/heads/1.7 612ede696 -> f6465ac3c
  refs/heads/1.8 7a47b187e -> 394ad0864
  refs/heads/master 29e0ffd39 -> 3a0d07755


ACCUMULO-4382 Clean up license/notice files

Remove unnecessary contents.
Converge on a consistent formatting.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dbdba2f9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dbdba2f9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dbdba2f9

Branch: refs/heads/1.6
Commit: dbdba2f9319e8fabc4279bb052e0c9db4b0852aa
Parents: a8d1acd
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Jul 21 17:00:26 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jul 21 18:12:48 2016 -0400

----------------------------------------------------------------------
 LICENSE                                         | 108 +++---
 NOTICE                                          |   7 -
 assemble/bin-LICENSE                            | 335 +++++++++----------
 assemble/bin-NOTICE                             |  14 +-
 .../main/appended-resources/META-INF/LICENSE    |  71 ++--
 server/base/pom.xml                             |  29 --
 .../src/main/appended-resources/META-INF/NOTICE |   9 -
 server/base/src/main/javadoc/META-INF/LICENSE   | 202 -----------
 server/base/src/main/javadoc/META-INF/NOTICE    |   5 -
 .../main/appended-resources/META-INF/LICENSE    | 100 +++---
 server/monitor/src/main/javadoc/META-INF/NOTICE |   5 -
 server/native/src/main/resources/LICENSE        |   1 -
 server/native/src/main/resources/NOTICE         |   2 +-
 server/tserver/pom.xml                          |  29 --
 14 files changed, 321 insertions(+), 596 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 7082472..4cfbbec 100644
--- a/LICENSE
+++ b/LICENSE
@@ -201,20 +201,25 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+**********
 
 APACHE ACCUMULO SUBCOMPONENTS:
 
 The Apache Accumulo project contains subcomponents with separate copyright
 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.
+subcomponents is subject to the terms and conditions of the following licenses.
 
-This product bundles softare from the European Commission project OneLab
-under contract 034819 (http://www.one-lab.org), which is available under
-a "3-clause BSD" license. For details, see
-  core/src/main/java/org/apache/accumulo/core/bloomfilter/
+**********
+
+This product includes software from the European Commission project OneLab:
+
+* BloomFilter.java
+* DynamicBloomFilter.java
+* Filter.java
+
+    Copyright (c) 2005, European Commission project OneLab under contract 034819
+    (http://www.one-lab.org)
 
-    Copyright (c) 2005, European Commission project OneLab under contract 034819 (http://www.one-lab.org)
     All rights reserved.
     Redistribution and use in source and binary forms, with or
     without modification, are permitted provided that the following
@@ -242,56 +247,65 @@ a "3-clause BSD" license. For details, see
     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     POSSIBILITY OF SUCH DAMAGE.
 
-----
+**********
+
+This product includes JQuery:
+
+    Copyright 2011, John Resig
+    Dual licensed under the MIT or GPL Version 2 licenses.
+    http://jquery.org/license
+
+    Includes Sizzle.js
+    http://sizzlejs.com/
+    Copyright 2011, The Dojo Foundation
+    Released under the MIT, BSD, and GPL Licenses.
 
-This product bundles JQuery and Flot, which are each available under
-The MIT License (MIT). For details, see
-  server/monitor/src/main/resources/web/flot/
+    Distributed under the MIT License:
 
-Text of the MIT License:
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use,
+    copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following
+    conditions:
 
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    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.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-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,
+This product includes Flot:
 
-Copyright (c) 2007-2009 IOLA and Ole Laursen
+    Copyright (c) 2007-2009 IOLA and Ole Laursen
 
-Available under the MIT License (see above)
+    Available under the MIT License (see above)
 
-Flot bundles additional works:
+    Flot bundles additional works:
 
-jquery.pie.js
-* Created by Brian Medendorp, June 2009
-* Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+    jquery.pie.js
+    * Created by Brian Medendorp, June 2009
+    * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
 
-jquery.flot.resize.js
-* Inline dependency:
- * jQuery resize event - v1.1 - 3/14/2010
- * http://benalman.com/projects/jquery-resize-plugin/
- *
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
+    jquery.flot.resize.js
+    * Inline dependency:
+     * jQuery resize event - v1.1 - 3/14/2010
+     * http://benalman.com/projects/jquery-resize-plugin/
+     *
+     * Copyright (c) 2010 "Cowboy" Ben Alman
+     * Dual licensed under the MIT and GPL licenses.
+     * http://benalman.com/about/license/
 
-distributed under the MIT license (see above)
+    distributed under the MIT license (see above)
 
-----
+**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index b2d441a..3a3fc27 100644
--- a/NOTICE
+++ b/NOTICE
@@ -3,10 +3,3 @@ Copyright 2011-2016 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
-
-This product includes the following work from the Apache Thrift project:
-
-TNonblockingServerSocket.java
-
-Apache Thrift
-Copyright 2006-2010 The Apache Software Foundation.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/assemble/bin-LICENSE
----------------------------------------------------------------------
diff --git a/assemble/bin-LICENSE b/assemble/bin-LICENSE
index 2f5fd9f..9cfab86 100644
--- a/assemble/bin-LICENSE
+++ b/assemble/bin-LICENSE
@@ -201,117 +201,116 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+**********
 
 APACHE ACCUMULO SUBCOMPONENTS:
 
 The Apache Accumulo project contains subcomponents with separate copyright
 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.
+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),
+**********
+
+This product includes software from the European Commission project OneLab:
 
 * BloomFilter.java
 * DynamicBloomFilter.java
 * 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
- * 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 the University Catholique de Louvain - UCL
- *    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.
-
-----
-
-This product bundles JQuery
-
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
-
-Distributed under the MIT License:
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-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/
-
-Copyright (c) 2007-2009 IOLA and Ole Laursen
-
-Available under the MIT License (see above)
-
-Flot bundles additional works:
-
-jquery.pie.js
-* Created by Brian Medendorp, June 2009
-* Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
-
-jquery.flot.resize.js
-* Inline dependency:
- * jQuery resize event - v1.1 - 3/14/2010
- * http://benalman.com/projects/jquery-resize-plugin/
- *
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
-
-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:
+    Copyright (c) 2005, European Commission project OneLab under contract 034819
+    (http://www.one-lab.org)
+
+    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 the University Catholique de Louvain - UCL
+       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.
+
+**********
+
+This product includes JQuery:
+
+    Copyright 2011, John Resig
+    Dual licensed under the MIT or GPL Version 2 licenses.
+    http://jquery.org/license
+
+    Includes Sizzle.js
+    http://sizzlejs.com/
+    Copyright 2011, The Dojo Foundation
+    Released under the MIT, BSD, and GPL Licenses.
+
+    Distributed under the MIT License:
+
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use,
+    copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following
+    conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    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 includes Flot:
+
+    Copyright (c) 2007-2009 IOLA and Ole Laursen
+
+    Available under the MIT License (see above)
+
+    Flot bundles additional works:
+
+    jquery.pie.js
+    * Created by Brian Medendorp, June 2009
+    * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+
+    jquery.flot.resize.js
+    * Inline dependency:
+     * jQuery resize event - v1.1 - 3/14/2010
+     * http://benalman.com/projects/jquery-resize-plugin/
+     *
+     * Copyright (c) 2010 "Cowboy" Ben Alman
+     * Dual licensed under the MIT and GPL licenses.
+     * http://benalman.com/about/license/
+
+    distributed under the MIT license (see above)
+
+**********
+
+This product includes jline:
 
     The BSD License
 
@@ -348,47 +347,48 @@ 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 includes Apache Commons Math:
 
     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.math.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 +402,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 +414,101 @@ 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:
-    
-    
+
+
     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 
+
+    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 
+
+    - 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 
+
+    - 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 
+
+    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  
+    "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 
+    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  
+    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. 
+    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 
+    routines translated in MersenneTwister class in package
     org.apache.commons.math.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 +521,10 @@ 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.
 
----------
 
-This distribution of this product bundles slf4j, which is available
-under the following MIT license:
+**********
+
+This product includes slf4j:
 
     Copyright (c) 2004-2013 QOS.ch
     All rights reserved.
@@ -548,10 +548,9 @@ 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).
+This product includes javax.servlet-api (http://servlet-spec.java.net):
 
   COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
 
@@ -881,4 +880,4 @@ available under the CDDL 1.0 license (http://servlet-spec.java.net).
      of the State of California, with venue lying in Santa Clara County,
      California.
 
-------
+**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/assemble/bin-NOTICE
----------------------------------------------------------------------
diff --git a/assemble/bin-NOTICE b/assemble/bin-NOTICE
index 07d574b..f6370f2 100644
--- a/assemble/bin-NOTICE
+++ b/assemble/bin-NOTICE
@@ -4,18 +4,18 @@ Copyright 2011-2016 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
+**********
+
 This product includes JCommander (https://github.com/cbeust/jcommander),
 Copyright 2010 Cedric Beust cedric@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/).
+This product includes Apache Commons Math (https://commons.apache.org/proper/commons-math/).
 Copyright 2001-2010 The Apache Software Foundation
 
+From commons-math NOTICE.txt:
+
     ===============================================================================
     The LinearConstraint, LinearObjectiveFunction, LinearOptimizer,
     RelationShip, SimplexSolver and SimplexTableau classes in package
@@ -55,5 +55,7 @@ Copyright 2001-2010 The Apache Software Foundation
     All rights reserved
     ===============================================================================
 
+**********
+
 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/dbdba2f9/core/src/main/appended-resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/core/src/main/appended-resources/META-INF/LICENSE b/core/src/main/appended-resources/META-INF/LICENSE
index af566f0..f3478ea 100644
--- a/core/src/main/appended-resources/META-INF/LICENSE
+++ b/core/src/main/appended-resources/META-INF/LICENSE
@@ -1,46 +1,47 @@
-----
+**********
 
 APACHE ACCUMULO SUBCOMPONENTS:
 
 The Apache Accumulo project contains subcomponents with separate copyright
 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.
+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),
+**********
+
+This product includes software from the European Commission project OneLab:
 
 * BloomFilter.java
 * DynamicBloomFilter.java
 * 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
- * 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 the University Catholique de Louvain - UCL
- *    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.
-
+    Copyright (c) 2005, European Commission project OneLab under contract 034819
+    (http://www.one-lab.org)
+
+    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 the University Catholique de Louvain - UCL
+       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.
+
+**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/base/pom.xml
----------------------------------------------------------------------
diff --git a/server/base/pom.xml b/server/base/pom.xml
index ea33018..7b11aa1 100644
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@ -118,34 +118,5 @@
         <directory>src/test/resources</directory>
       </testResource>
     </testResources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>license-javadocs</id>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>src/main/javadoc/META-INF/</directory>
-                  <targetPath>META-INF/</targetPath>
-                  <includes>
-                    <include>LICENSE</include>
-                    <include>NOTICE</include>
-                  </includes>
-                  <filtering>true</filtering>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
   </build>
 </project>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/base/src/main/appended-resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/server/base/src/main/appended-resources/META-INF/NOTICE b/server/base/src/main/appended-resources/META-INF/NOTICE
deleted file mode 100644
index a4f1f1a..0000000
--- a/server/base/src/main/appended-resources/META-INF/NOTICE
+++ /dev/null
@@ -1,9 +0,0 @@
-----
-
-This product includes the following work from the Apache Thrift project:
-
-TNonblockingServerSocket.java
-
-Apache Thrift
-Copyright 2006-2010 The Apache Software Foundation.
-

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/base/src/main/javadoc/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/server/base/src/main/javadoc/META-INF/LICENSE b/server/base/src/main/javadoc/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/server/base/src/main/javadoc/META-INF/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/base/src/main/javadoc/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/server/base/src/main/javadoc/META-INF/NOTICE b/server/base/src/main/javadoc/META-INF/NOTICE
deleted file mode 100644
index 3a3fc27..0000000
--- a/server/base/src/main/javadoc/META-INF/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Accumulo
-Copyright 2011-2016 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/monitor/src/main/appended-resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/appended-resources/META-INF/LICENSE b/server/monitor/src/main/appended-resources/META-INF/LICENSE
index 974cb4b..ae202cb 100644
--- a/server/monitor/src/main/appended-resources/META-INF/LICENSE
+++ b/server/monitor/src/main/appended-resources/META-INF/LICENSE
@@ -1,74 +1,70 @@
-----
+**********
 
 APACHE ACCUMULO SUBCOMPONENTS:
 
 The Apache Accumulo project contains subcomponents with separate copyright
 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.
+subcomponents is subject to the terms and conditions of the following licenses.
 
-----
+**********
 
-This product bundles JQuery
+This product includes JQuery:
 
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
+    Copyright 2011, John Resig
+    Dual licensed under the MIT or GPL Version 2 licenses.
+    http://jquery.org/license
 
-Distributed under the MIT License:
+    Includes Sizzle.js
+    http://sizzlejs.com/
+    Copyright 2011, The Dojo Foundation
+    Released under the MIT, BSD, and GPL Licenses.
 
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
+    Distributed under the MIT License:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use,
+    copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following
+    conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-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.
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
 
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    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,
+**********
 
-Copyright (c) 2007-2009 IOLA and Ole Laursen
+This product includes Flot:
 
-Available under the MIT License (see above)
+    Copyright (c) 2007-2009 IOLA and Ole Laursen
 
-Flot bundles additional works:
+    Available under the MIT License (see above)
 
-jquery.pie.js
-* Created by Brian Medendorp, June 2009
-* Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+    Flot bundles additional works:
 
-jquery.flot.resize.js
-* Inline dependency:
- * jQuery resize event - v1.1 - 3/14/2010
- * http://benalman.com/projects/jquery-resize-plugin/
- *
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
+    jquery.pie.js
+    * Created by Brian Medendorp, June 2009
+    * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
 
-distributed under the MIT license (see above)
+    jquery.flot.resize.js
+    * Inline dependency:
+     * jQuery resize event - v1.1 - 3/14/2010
+     * http://benalman.com/projects/jquery-resize-plugin/
+     *
+     * Copyright (c) 2010 "Cowboy" Ben Alman
+     * Dual licensed under the MIT and GPL licenses.
+     * http://benalman.com/about/license/
 
-For details, see
-  server/src/main/resources/web/flot/
+    distributed under the MIT license (see above)
 
-----
+**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/monitor/src/main/javadoc/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/javadoc/META-INF/NOTICE b/server/monitor/src/main/javadoc/META-INF/NOTICE
deleted file mode 100644
index 3a3fc27..0000000
--- a/server/monitor/src/main/javadoc/META-INF/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Accumulo
-Copyright 2011-2016 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/native/src/main/resources/LICENSE
----------------------------------------------------------------------
diff --git a/server/native/src/main/resources/LICENSE b/server/native/src/main/resources/LICENSE
index 6b0b127..d645695 100644
--- a/server/native/src/main/resources/LICENSE
+++ b/server/native/src/main/resources/LICENSE
@@ -200,4 +200,3 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/native/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/server/native/src/main/resources/NOTICE b/server/native/src/main/resources/NOTICE
index 3a3fc27..2316e0f 100644
--- a/server/native/src/main/resources/NOTICE
+++ b/server/native/src/main/resources/NOTICE
@@ -1,4 +1,4 @@
-Apache Accumulo
+Apache Accumulo Native Libraries
 Copyright 2011-2016 The Apache Software Foundation
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/tserver/pom.xml
----------------------------------------------------------------------
diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml
index 5ac1b46..fc1c9fb 100644
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@ -125,34 +125,5 @@
         </plugin>
       </plugins>
     </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>license-javadocs</id>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>src/main/javadoc/META-INF/</directory>
-                  <targetPath>META-INF/</targetPath>
-                  <includes>
-                    <include>LICENSE</include>
-                    <include>NOTICE</include>
-                  </includes>
-                  <filtering>true</filtering>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
   </build>
 </project>


[11/18] accumulo git commit: ACCUMULO-4384 Simplify rat excludes

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/src/main/resources/LICENSE
----------------------------------------------------------------------
diff --git a/assemble/src/main/resources/LICENSE b/assemble/src/main/resources/LICENSE
new file mode 100644
index 0000000..9cfab86
--- /dev/null
+++ b/assemble/src/main/resources/LICENSE
@@ -0,0 +1,883 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+**********
+
+APACHE ACCUMULO SUBCOMPONENTS:
+
+The Apache Accumulo project contains subcomponents with separate copyright
+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 includes software from the European Commission project OneLab:
+
+* BloomFilter.java
+* DynamicBloomFilter.java
+* Filter.java
+
+    Copyright (c) 2005, European Commission project OneLab under contract 034819
+    (http://www.one-lab.org)
+
+    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 the University Catholique de Louvain - UCL
+       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.
+
+**********
+
+This product includes JQuery:
+
+    Copyright 2011, John Resig
+    Dual licensed under the MIT or GPL Version 2 licenses.
+    http://jquery.org/license
+
+    Includes Sizzle.js
+    http://sizzlejs.com/
+    Copyright 2011, The Dojo Foundation
+    Released under the MIT, BSD, and GPL Licenses.
+
+    Distributed under the MIT License:
+
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use,
+    copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following
+    conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    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 includes Flot:
+
+    Copyright (c) 2007-2009 IOLA and Ole Laursen
+
+    Available under the MIT License (see above)
+
+    Flot bundles additional works:
+
+    jquery.pie.js
+    * Created by Brian Medendorp, June 2009
+    * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+
+    jquery.flot.resize.js
+    * Inline dependency:
+     * jQuery resize event - v1.1 - 3/14/2010
+     * http://benalman.com/projects/jquery-resize-plugin/
+     *
+     * Copyright (c) 2010 "Cowboy" Ben Alman
+     * Dual licensed under the MIT and GPL licenses.
+     * http://benalman.com/about/license/
+
+    distributed under the MIT license (see above)
+
+**********
+
+This product includes jline:
+
+    The BSD License
+
+    Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>
+    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 JLine 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.
+
+**********
+
+This product includes Apache Commons Math:
+
+    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
+    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
+    THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE
+    OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY
+    OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR
+    USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF
+    THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4)
+    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,
+    INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF
+    ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF
+    PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER
+    SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT
+    (INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE,
+    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:
+
+
+    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.
+
+    - 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.
+    ===============================================================================
+
+    Copyright and license statement for the original Mersenne twister C
+    routines translated in MersenneTwister class in package
+    org.apache.commons.math.random:
+
+       Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+       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
+            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.
+
+
+**********
+
+This product includes slf4j:
+
+    Copyright (c) 2004-2013 QOS.ch
+    All rights reserved.
+
+    Permission is hereby granted, free  of charge, to any person obtaining
+    a  copy  of this  software  and  associated  documentation files  (the
+    "Software"), to  deal in  the Software without  restriction, including
+    without limitation  the rights to  use, copy, modify,  merge, publish,
+    distribute,  sublicense, and/or sell  copies of  the Software,  and to
+    permit persons to whom the Software  is furnished to do so, subject to
+    the following conditions:
+
+    The  above  copyright  notice  and  this permission  notice  shall  be
+    included in all copies or substantial portions of the Software.
+
+    THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+    EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+    MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 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 includes javax.servlet-api (http://servlet-spec.java.net):
+
+  COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+  1. Definitions.
+
+     1.1. Contributor. means each individual or entity that creates or
+     contributes to the creation of Modifications.
+
+     1.2. Contributor Version. means the combination of the Original Software,
+     prior Modifications used by a Contributor (if any), and the Modifications
+     made by that particular Contributor.
+
+     1.3. Covered Software. means (a) the Original Software, or (b)
+     Modifications, or (c) the combination of files containing Original Software
+     with files containing Modifications, in each case including portions thereof.
+
+     1.4. Executable. means the Covered Software in any form other than Source
+     Code.
+
+     1.5. Initial Developer. means the individual or entity that first makes
+     Original Software available under this License.
+
+     1.6. Larger Work. means a work which combines Covered Software or portions
+     thereof with code not governed by the terms of this License.
+
+     1.7. License. means this document.
+
+     1.8. Licensable. means having the right to grant, to the maximum extent
+     possible, whether at the time of the initial grant or subsequently
+     acquired, any and all of the rights conveyed herein.
+
+     1.9. Modifications. means the Source Code and Executable form of any of the
+     following:
+
+          A. Any file that results from an addition to, deletion from or
+          modification of the contents of a file containing Original Software or
+          previous Modifications;
+
+          B. Any new file that contains any part of the Original Software or
+          previous Modification; or
+
+          C. Any new file that is contributed or otherwise made available under
+          the terms of this License.
+
+     1.10. Original Software. means the Source Code and Executable form of
+     computer software code that is originally released under this License.
+
+     1.11. Patent Claims. means any patent claim(s), now owned or hereafter
+     acquired, including without limitation, method, process, and apparatus
+     claims, in any patent Licensable by grantor.
+
+     1.12. Source Code. means (a) the common form of computer software code in
+     which modifications are made and (b) associated documentation included in
+     or with such code.
+
+     1.13. You. (or .Your.) means an individual or a legal entity exercising
+     rights under, and complying with all of the terms of, this License. For
+     legal entities, .You. includes any entity which controls, is controlled by,
+     or is under common control with You. For purposes of this definition,
+     .control. means (a) the power, direct or indirect, to cause the direction
+     or management of such entity, whether by contract or otherwise, or (b)
+     ownership of more than fifty percent (50%) of the outstanding shares or
+     beneficial ownership of such entity.
+
+  2. License Grants.
+
+        2.1. The Initial Developer Grant.
+
+        Conditioned upon Your compliance with Section 3.1 below and subject to
+        third party intellectual property claims, the Initial Developer hereby
+        grants You a world-wide, royalty-free, non-exclusive license:
+
+           (a) under intellectual property rights (other than patent or
+           trademark) Licensable by Initial Developer, to use, reproduce,
+           modify, display, perform, sublicense and distribute the Original
+           Software (or portions thereof), with or without Modifications, and/or
+           as part of a Larger Work; and
+
+           (b) under Patent Claims infringed by the making, using or selling of
+           Original Software, to make, have made, use, practice, sell, and offer
+           for sale, and/or otherwise dispose of the Original Software (or
+           portions thereof).
+
+          (c) The licenses granted in Sections 2.1(a) and (b) are effective on
+          the date Initial Developer first distributes or otherwise makes the
+          Original Software available to a third party under the terms of this
+          License.
+
+          (d) Notwithstanding Section 2.1(b) above, no patent license is
+          granted: (1) for code that You delete from the Original Software, or
+          (2) for infringements caused by: (i) the modification of the Original
+          Software, or (ii) the combination of the Original Software with other
+          software or devices.
+
+      2.2. Contributor Grant.
+
+      Conditioned upon Your compliance with Section 3.1 below and subject to
+      third party intellectual property claims, each Contributor hereby grants
+      You a world-wide, royalty-free, non-exclusive license:
+
+          (a) under intellectual property rights (other than patent or
+          trademark) Licensable by Contributor to use, reproduce, modify,
+          display, perform, sublicense and distribute the Modifications created
+          by such Contributor (or portions thereof), either on an unmodified
+          basis, with other Modifications, as Covered Software and/or as part of
+          a Larger Work; and
+
+          (b) under Patent Claims infringed by the making, using, or selling of
+          Modifications made by that Contributor either alone and/or in
+          combination with its Contributor Version (or portions of such
+          combination), to make, use, sell, offer for sale, have made,
+          and/or otherwise dispose of: (1) Modifications made by that
+          Contributor (or portions thereof); and (2) the combination of
+          Modifications made by that Contributor with its Contributor Version
+          (or portions of such combination).
+
+          (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
+          on the date Contributor first distributes or otherwise makes the
+          Modifications available to a third party.
+
+          (d) Notwithstanding Section 2.2(b) above, no patent license is
+          granted: (1) for any code that Contributor has deleted from the
+          Contributor Version; (2) for infringements caused by: (i) third party
+          modifications of Contributor Version, or (ii) the combination of
+          Modifications made by that Contributor with other software (except as
+          part of the Contributor Version) or other devices; or (3) under
+          Patent Claims infringed by Covered Software in the absence of
+          Modifications made by that Contributor.
+
+  3. Distribution Obligations.
+
+        3.1. Availability of Source Code.  Any Covered Software that You
+        distribute or otherwise make available in Executable form must also be
+        made available in Source Code form and that Source Code form must be
+        distributed only under the terms of this License. You must include a
+        copy of this License with every copy of the Source Code form of the
+        Covered Software You distribute or otherwise make available. You must
+        inform recipients of any such Covered Software in Executable form as to
+        how they can obtain such Covered Software in Source Code form in a
+        reasonable manner on or through a medium customarily used for software
+        exchange.
+
+        3.2. Modifications.  The Modifications that You create or to which You
+        contribute are governed by the terms of this License. You represent that
+        You believe Your Modifications are Your original creation(s) and/or You
+        have sufficient rights to grant the rights conveyed by this License.
+
+        3.3. Required Notices.  You must include a notice in each of Your
+        Modifications that identifies You as the Contributor of the
+        Modification. You may not remove or alter any copyright, patent or
+        trademark notices contained within the Covered Software, or any notices
+        of licensing or any descriptive text giving attribution to any
+        Contributor or the Initial Developer.
+
+        3.4. Application of Additional Terms.  You may not offer or impose any
+        terms on any Covered Software in Source Code form that alters or
+        restricts the applicable version of this License or the recipients.
+        rights hereunder.  You may choose to offer, and to charge a fee for,
+        warranty, support, indemnity or liability obligations to one or more
+        recipients of Covered Software. However, you may do so only on Your own
+        behalf, and not on behalf of the Initial Developer or any Contributor.
+        You must make it absolutely clear that any such warranty, support,
+        indemnity or liability obligation is offered by You alone, and You
+        hereby agree to indemnify the Initial Developer and every Contributor
+        for any liability incurred by the Initial Developer or such Contributor
+        as a result of warranty, support, indemnity or liability terms You
+        offer.
+
+        3.5. Distribution of Executable Versions.  You may distribute the
+        Executable form of the Covered Software under the terms of this License
+        or under the terms of a license of Your choice, which may contain terms
+        different from this License, provided that You are in compliance with
+        the terms of this License and that the license for the Executable form
+        does not attempt to limit or alter the recipient.s rights in the Source
+        Code form from the rights set forth in this License. If You distribute
+        the Covered Software in Executable form under a different license, You
+        must make it absolutely clear that any terms which differ from this
+        License are offered by You alone, not by the Initial Developer or
+        Contributor. You hereby agree to indemnify the Initial Developer and
+        every Contributor for any liability incurred by the Initial Developer or
+        such Contributor as a result of any such terms You offer.
+
+        3.6. Larger Works.  You may create a Larger Work by combining Covered
+        Software with other code not governed by the terms of this License and
+        distribute the Larger Work as a single product. In such a case, You must
+        make sure the requirements of this License are fulfilled for the Covered
+        Software.
+
+  4. Versions of the License.
+
+        4.1. New Versions.  Sun Microsystems, Inc. is the initial license
+        steward and may publish revised and/or new versions of this License from
+        time to time. Each version will be given a distinguishing version
+        number. Except as provided in Section 4.3, no one other than the license
+        steward has the right to modify this License.
+
+        4.2. Effect of New Versions.  You may always continue to use, distribute
+        or otherwise make the Covered Software available under the terms of the
+        version of the License under which You originally received the Covered
+        Software. If the Initial Developer includes a notice in the Original
+        Software prohibiting it from being distributed or otherwise made
+        available under any subsequent version of the License, You must
+        distribute and make the Covered Software available under the terms of
+        the version of the License under which You originally received the
+        Covered Software. Otherwise, You may also choose to use, distribute or
+        otherwise make the Covered Software available under the terms of any
+        subsequent version of the License published by the license steward.
+
+        4.3. Modified Versions.  When You are an Initial Developer and You want
+        to create a new license for Your Original Software, You may create and
+        use a modified version of this License if You: (a) rename the license
+        and remove any references to the name of the license steward (except to
+        note that the license differs from this License); and (b) otherwise
+        make it clear that the license contains terms which differ from this
+        License.
+
+  5. DISCLAIMER OF WARRANTY.
+
+     COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE
+     ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS
+     WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU
+     (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
+     NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY
+     CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
+     SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+  6. TERMINATION.
+
+        6.1. This License and the rights granted hereunder will terminate
+        automatically if You fail to comply with terms herein and fail to cure
+        such breach within 30 days of becoming aware of the breach. Provisions
+        which, by their nature, must remain in effect beyond the termination of
+        this License shall survive.
+
+        6.2. If You assert a patent infringement claim (excluding declaratory
+        judgment actions) against Initial Developer or a Contributor (the
+        Initial Developer or Contributor against whom You assert such
+        claim is referred to as .Participant.) alleging that the
+        Participant Software (meaning the Contributor Version where the
+        Participant is a Contributor or the Original Software where the
+        Participant is the Initial Developer) directly or indirectly
+        infringes any patent, then any and all rights granted directly or
+        indirectly to You by such Participant, the Initial Developer (if the
+        Initial Developer is not the Participant) and all Contributors
+        under Sections 2.1 and/or 2.2 of this License shall, upon 60 days
+        notice from Participant terminate prospectively and automatically at
+        the expiration of such 60 day notice period, unless if within such
+        60 day period You withdraw Your claim with respect to the
+        Participant Software against such Participant either unilaterally or
+        pursuant to a written agreement with Participant.
+
+        6.3. In the event of termination under Sections 6.1 or 6.2 above, all
+        end user licenses that have been validly granted by You or any
+        distributor hereunder prior to termination (excluding licenses granted
+        to You by any distributor) shall survive termination.
+
+  7. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
+     NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER,
+     ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY
+     SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT,
+     SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING,
+     WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
+     STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL
+     DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
+     POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY
+     TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY.S
+     NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME
+     JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+     CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
+     YOU.
+
+  8. U.S. GOVERNMENT END USERS.
+
+     The Covered Software is a .commercial item,. as that term is defined in 48
+     C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as
+     that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and .commercial
+     computer software documentation. as such terms are used in 48 C.F.R. 12.212
+     (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+     through 227.7202-4 (June 1995), all U.S. Government End Users acquire
+     Covered Software with only those rights set forth herein. This U.S.
+     Government Rights clause is in lieu of, and supersedes, any other FAR,
+     DFAR, or other clause or provision that addresses Government rights in
+     computer software under this License.
+
+  9. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject matter
+     hereof. If any provision of this License is held to be unenforceable, such
+     provision shall be reformed only to the extent necessary to make it
+     enforceable.  This License shall be governed by the law of the jurisdiction
+     specified in a notice contained within the Original Software (except to the
+     extent applicable law, if any, provides otherwise), excluding such
+     jurisdiction.s conflict-of-law provisions. Any litigation relating to this
+     License shall be subject to the jurisdiction of the courts located in the
+     jurisdiction and venue specified in a notice contained within the Original
+     Software, with the losing party responsible for costs, including, without
+     limitation, court costs and reasonable attorneys. fees and expenses. The
+     application of the United Nations Convention on Contracts for the
+     International Sale of Goods is expressly excluded. Any law or regulation
+     which provides that the language of a contract shall be construed against
+     the drafter shall not apply to this License. You agree that You alone are
+     responsible for compliance with the United States export administration
+     regulations (and the export control laws and regulation of any other countries)
+     when You use, distribute or otherwise make available any Covered Software.
+
+  10. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is
+     responsible for claims and damages arising, directly or indirectly, out of
+     its utilization of rights under this License and You agree to work with
+     Initial Developer and Contributors to distribute such responsibility on an
+     equitable basis. Nothing herein is intended or shall be deemed to
+     constitute any admission of liability.
+
+     NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
+     LICENSE (CDDL)
+
+     The code released under the CDDL shall be governed by the laws of the State
+     of California (excluding conflict-of-law provisions). Any litigation
+     relating to this License shall be subject to the jurisdiction of the
+     Federal Courts of the Northern District of California and the state courts
+     of the State of California, with venue lying in Santa Clara County,
+     California.
+
+**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/assemble/src/main/resources/NOTICE b/assemble/src/main/resources/NOTICE
new file mode 100644
index 0000000..f6370f2
--- /dev/null
+++ b/assemble/src/main/resources/NOTICE
@@ -0,0 +1,61 @@
+Apache Accumulo
+Copyright 2011-2016 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+**********
+
+This product includes JCommander (https://github.com/cbeust/jcommander),
+Copyright 2010 Cedric Beust cedric@beust.com.
+
+**********
+
+This product includes Apache Commons Math (https://commons.apache.org/proper/commons-math/).
+Copyright 2001-2010 The Apache Software Foundation
+
+From commons-math NOTICE.txt:
+
+    ===============================================================================
+    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
+    ===============================================================================
+
+    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.
+    ===============================================================================
+
+    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 Jetty (http://eclipse.org/jetty)
+Copyright 1996-2009 Mort Bay Consulting Pty. Ltd.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 30468da..b701d8a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -166,16 +166,8 @@
           <configuration>
             <excludes>
               <exclude>src/test/resources/shelltest.txt</exclude>
-              <exclude>src/test/resources/org/apache/accumulo/core/file/rfile/ver_3.rf</exclude>
-              <exclude>src/test/resources/org/apache/accumulo/core/file/rfile/ver_4.rf</exclude>
-              <exclude>src/test/resources/org/apache/accumulo/core/file/rfile/ver_6.rf</exclude>
-              <exclude>src/test/resources/site-cfg.jceks</exclude>
-              <exclude>src/test/resources/accumulo.jceks</exclude>
-              <exclude>src/test/resources/empty.jceks</exclude>
-              <exclude>src/test/resources/passwords.jceks</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
+              <exclude>src/test/resources/org/apache/accumulo/core/file/rfile/*.rf</exclude>
+              <exclude>src/test/resources/*.jceks</exclude>
             </excludes>
           </configuration>
         </plugin>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/examples/simple/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml
index 15e9951..2dd75eb 100644
--- a/examples/simple/pom.xml
+++ b/examples/simple/pom.xml
@@ -89,18 +89,6 @@
             <skip>true</skip>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <configuration>
-            <excludes>
-              <exclude>src/main/resources/META-INF/services/org.apache.accumulo.core.util.shell.ShellExtension</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6b29f4c..3027270 100644
--- a/pom.xml
+++ b/pom.xml
@@ -753,7 +753,8 @@
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
           <configuration>
-            <excludes>
+            <excludes combine.children="append">
+              <exclude>src/main/resources/META-INF/services/*</exclude>
               <exclude>nbproject/**</exclude>
               <exclude>nb-configuration.xml</exclude>
               <exclude>nbactions.xml</exclude>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/server/monitor/pom.xml
----------------------------------------------------------------------
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index 09df0e8..782085a 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -134,9 +134,6 @@
           <configuration>
             <excludes>
               <exclude>src/main/resources/web/flot/**/*.js</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
             </excludes>
           </configuration>
         </plugin>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/server/tserver/pom.xml
----------------------------------------------------------------------
diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml
index fc1c9fb..56366b5 100644
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@ -117,9 +117,6 @@
             <excludes>
               <exclude>src/test/resources/*.walog</exclude>
               <exclude>src/test/resources/walog-from-14/*</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
             </excludes>
           </configuration>
         </plugin>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 4f56790..e3cba7e 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -183,9 +183,6 @@
             <excludes>
               <exclude>system/bench/lib/*splits</exclude>
               <exclude>system/continuous/*.txt</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
             </excludes>
           </configuration>
         </plugin>


[14/18] accumulo git commit: Merge branch '1.6' into 1.7

Posted by ct...@apache.org.
Merge branch '1.6' into 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f6465ac3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f6465ac3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f6465ac3

Branch: refs/heads/1.7
Commit: f6465ac3c3fee340fce5df4ebd6ce56487b25518
Parents: 612ede6 0fdd52a
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Jul 21 18:22:25 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jul 21 18:22:25 2016 -0400

----------------------------------------------------------------------
 LICENSE                                         | 109 ++-
 NOTICE                                          |   7 -
 assemble/bin-LICENSE                            | 924 -------------------
 assemble/bin-NOTICE                             |  59 --
 assemble/pom.xml                                |  17 -
 assemble/src/main/assemblies/component.xml      |  22 +-
 assemble/src/main/resources/LICENSE             | 921 ++++++++++++++++++
 assemble/src/main/resources/NOTICE              |  61 ++
 core/pom.xml                                    |  12 +-
 .../main/appended-resources/META-INF/LICENSE    |  71 +-
 examples/simple/pom.xml                         |  12 -
 pom.xml                                         |   3 +-
 server/base/pom.xml                             |  29 -
 .../src/main/appended-resources/META-INF/NOTICE |   9 -
 server/base/src/main/javadoc/META-INF/LICENSE   | 202 ----
 server/base/src/main/javadoc/META-INF/NOTICE    |   5 -
 server/monitor/pom.xml                          |   3 -
 .../main/appended-resources/META-INF/LICENSE    | 100 +-
 server/monitor/src/main/javadoc/META-INF/NOTICE |   5 -
 server/native/src/main/resources/LICENSE        |   1 -
 server/native/src/main/resources/NOTICE         |   2 +-
 server/tserver/pom.xml                          |  32 -
 shell/pom.xml                                   |  17 -
 test/pom.xml                                    |   3 -
 24 files changed, 1142 insertions(+), 1484 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/assemble/pom.xml
----------------------------------------------------------------------
diff --cc assemble/pom.xml
index 1ee64b4,c9bd8c5..58016ef
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@@ -170,47 -162,8 +170,30 @@@
      </dependency>
    </dependencies>
    <build>
-     <pluginManagement>
-       <plugins>
-         <plugin>
-           <groupId>org.apache.rat</groupId>
-           <artifactId>apache-rat-plugin</artifactId>
-           <configuration>
-             <excludes>
-               <exclude>bin-LICENSE</exclude>
-               <exclude>bin-NOTICE</exclude>
-               <exclude>nbproject/**</exclude>
-               <exclude>nb-configuration.xml</exclude>
-               <exclude>nbactions.xml</exclude>
-             </excludes>
-           </configuration>
-         </plugin>
-       </plugins>
-     </pluginManagement>
      <plugins>
        <plugin>
 +        <groupId>org.apache.maven.plugins</groupId>
 +        <artifactId>maven-dependency-plugin</artifactId>
 +        <executions>
 +          <execution>
 +            <!-- generate version listing for packaged dependencies -->
 +            <id>generate-dependencies-raw</id>
 +            <goals>
 +              <goal>list</goal>
 +            </goals>
 +            <phase>compile</phase>
 +            <configuration>
 +              <outputFile>${project.build.directory}/dependencies.raw.txt</outputFile>
 +              <outputScope>false</outputScope>
 +              <sort>true</sort>
 +              <!-- this list should match that in src/main/assemblies/component.xml -->
 +              <includeArtifactIds>commons-math,commons-vfs2,gson,guava,htrace-core,javax.servlet-api,jcommander,jetty-http,jetty-io,jetty-security,jetty-server,jetty-servlet,jetty-util,jline,libthrift,protobuf-java,slf4j-api,slf4j-log4j12</includeArtifactIds>
 +              <excludeTransitive>true</excludeTransitive>
 +            </configuration>
 +          </execution>
 +        </executions>
 +      </plugin>
 +      <plugin>
          <groupId>org.codehaus.mojo</groupId>
          <artifactId>exec-maven-plugin</artifactId>
          <executions>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/assemble/src/main/assemblies/component.xml
----------------------------------------------------------------------
diff --cc assemble/src/main/assemblies/component.xml
index 22a5c22,b9ea051..84a3a06
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@@ -248,30 -244,18 +248,28 @@@
        <directory>../</directory>
        <fileMode>0644</fileMode>
        <includes>
 -        <include>README</include>
 +        <include>README.md</include>
 +        <include>INSTALL.md</include>
 +        <include>BUILD.md</include>
 +      </includes>
 +    </fileSet>
 +    <fileSet>
 +      <directory>target</directory>
 +      <outputDirectory>lib</outputDirectory>
 +      <fileMode>0644</fileMode>
 +      <includes>
 +        <include>VERSIONS</include>
        </includes>
      </fileSet>
-   </fileSets>
-   <files>
-     <file>
-       <source>bin-NOTICE</source>
-       <destName>NOTICE</destName>
-       <fileMode>0644</fileMode>
-     </file>
-     <file>
-       <source>bin-LICENSE</source>
-       <destName>LICENSE</destName>
+     <fileSet>
+       <directory>src/main/resources</directory>
+       <directoryMode>0755</directoryMode>
        <fileMode>0644</fileMode>
-     </file>
-   </files>
+       <outputDirectory>.</outputDirectory>
+       <includes>
+         <include>LICENSE</include>
+         <include>NOTICE</include>
+       </includes>
+     </fileSet>
+   </fileSets>
  </component>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/assemble/src/main/resources/LICENSE
----------------------------------------------------------------------
diff --cc assemble/src/main/resources/LICENSE
index 0000000,9cfab86..9ba98fd
mode 000000,100644..100644
--- a/assemble/src/main/resources/LICENSE
+++ b/assemble/src/main/resources/LICENSE
@@@ -1,0 -1,883 +1,921 @@@
+ 
+                                  Apache License
+                            Version 2.0, January 2004
+                         http://www.apache.org/licenses/
+ 
+    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ 
+    1. Definitions.
+ 
+       "License" shall mean the terms and conditions for use, reproduction,
+       and distribution as defined by Sections 1 through 9 of this document.
+ 
+       "Licensor" shall mean the copyright owner or entity authorized by
+       the copyright owner that is granting the License.
+ 
+       "Legal Entity" shall mean the union of the acting entity and all
+       other entities that control, are controlled by, or are under common
+       control with that entity. For the purposes of this definition,
+       "control" means (i) the power, direct or indirect, to cause the
+       direction or management of such entity, whether by contract or
+       otherwise, or (ii) ownership of fifty percent (50%) or more of the
+       outstanding shares, or (iii) beneficial ownership of such entity.
+ 
+       "You" (or "Your") shall mean an individual or Legal Entity
+       exercising permissions granted by this License.
+ 
+       "Source" form shall mean the preferred form for making modifications,
+       including but not limited to software source code, documentation
+       source, and configuration files.
+ 
+       "Object" form shall mean any form resulting from mechanical
+       transformation or translation of a Source form, including but
+       not limited to compiled object code, generated documentation,
+       and conversions to other media types.
+ 
+       "Work" shall mean the work of authorship, whether in Source or
+       Object form, made available under the License, as indicated by a
+       copyright notice that is included in or attached to the work
+       (an example is provided in the Appendix below).
+ 
+       "Derivative Works" shall mean any work, whether in Source or Object
+       form, that is based on (or derived from) the Work and for which the
+       editorial revisions, annotations, elaborations, or other modifications
+       represent, as a whole, an original work of authorship. For the purposes
+       of this License, Derivative Works shall not include works that remain
+       separable from, or merely link (or bind by name) to the interfaces of,
+       the Work and Derivative Works thereof.
+ 
+       "Contribution" shall mean any work of authorship, including
+       the original version of the Work and any modifications or additions
+       to that Work or Derivative Works thereof, that is intentionally
+       submitted to Licensor for inclusion in the Work by the copyright owner
+       or by an individual or Legal Entity authorized to submit on behalf of
+       the copyright owner. For the purposes of this definition, "submitted"
+       means any form of electronic, verbal, or written communication sent
+       to the Licensor or its representatives, including but not limited to
+       communication on electronic mailing lists, source code control systems,
+       and issue tracking systems that are managed by, or on behalf of, the
+       Licensor for the purpose of discussing and improving the Work, but
+       excluding communication that is conspicuously marked or otherwise
+       designated in writing by the copyright owner as "Not a Contribution."
+ 
+       "Contributor" shall mean Licensor and any individual or Legal Entity
+       on behalf of whom a Contribution has been received by Licensor and
+       subsequently incorporated within the Work.
+ 
+    2. Grant of Copyright License. Subject to the terms and conditions of
+       this License, each Contributor hereby grants to You a perpetual,
+       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+       copyright license to reproduce, prepare Derivative Works of,
+       publicly display, publicly perform, sublicense, and distribute the
+       Work and such Derivative Works in Source or Object form.
+ 
+    3. Grant of Patent License. Subject to the terms and conditions of
+       this License, each Contributor hereby grants to You a perpetual,
+       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+       (except as stated in this section) patent license to make, have made,
+       use, offer to sell, sell, import, and otherwise transfer the Work,
+       where such license applies only to those patent claims licensable
+       by such Contributor that are necessarily infringed by their
+       Contribution(s) alone or by combination of their Contribution(s)
+       with the Work to which such Contribution(s) was submitted. If You
+       institute patent litigation against any entity (including a
+       cross-claim or counterclaim in a lawsuit) alleging that the Work
+       or a Contribution incorporated within the Work constitutes direct
+       or contributory patent infringement, then any patent licenses
+       granted to You under this License for that Work shall terminate
+       as of the date such litigation is filed.
+ 
+    4. Redistribution. You may reproduce and distribute copies of the
+       Work or Derivative Works thereof in any medium, with or without
+       modifications, and in Source or Object form, provided that You
+       meet the following conditions:
+ 
+       (a) You must give any other recipients of the Work or
+           Derivative Works a copy of this License; and
+ 
+       (b) You must cause any modified files to carry prominent notices
+           stating that You changed the files; and
+ 
+       (c) You must retain, in the Source form of any Derivative Works
+           that You distribute, all copyright, patent, trademark, and
+           attribution notices from the Source form of the Work,
+           excluding those notices that do not pertain to any part of
+           the Derivative Works; and
+ 
+       (d) If the Work includes a "NOTICE" text file as part of its
+           distribution, then any Derivative Works that You distribute must
+           include a readable copy of the attribution notices contained
+           within such NOTICE file, excluding those notices that do not
+           pertain to any part of the Derivative Works, in at least one
+           of the following places: within a NOTICE text file distributed
+           as part of the Derivative Works; within the Source form or
+           documentation, if provided along with the Derivative Works; or,
+           within a display generated by the Derivative Works, if and
+           wherever such third-party notices normally appear. The contents
+           of the NOTICE file are for informational purposes only and
+           do not modify the License. You may add Your own attribution
+           notices within Derivative Works that You distribute, alongside
+           or as an addendum to the NOTICE text from the Work, provided
+           that such additional attribution notices cannot be construed
+           as modifying the License.
+ 
+       You may add Your own copyright statement to Your modifications and
+       may provide additional or different license terms and conditions
+       for use, reproduction, or distribution of Your modifications, or
+       for any such Derivative Works as a whole, provided Your use,
+       reproduction, and distribution of the Work otherwise complies with
+       the conditions stated in this License.
+ 
+    5. Submission of Contributions. Unless You explicitly state otherwise,
+       any Contribution intentionally submitted for inclusion in the Work
+       by You to the Licensor shall be under the terms and conditions of
+       this License, without any additional terms or conditions.
+       Notwithstanding the above, nothing herein shall supersede or modify
+       the terms of any separate license agreement you may have executed
+       with Licensor regarding such Contributions.
+ 
+    6. Trademarks. This License does not grant permission to use the trade
+       names, trademarks, service marks, or product names of the Licensor,
+       except as required for reasonable and customary use in describing the
+       origin of the Work and reproducing the content of the NOTICE file.
+ 
+    7. Disclaimer of Warranty. Unless required by applicable law or
+       agreed to in writing, Licensor provides the Work (and each
+       Contributor provides its Contributions) on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied, including, without limitation, any warranties or conditions
+       of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+       PARTICULAR PURPOSE. You are solely responsible for determining the
+       appropriateness of using or redistributing the Work and assume any
+       risks associated with Your exercise of permissions under this License.
+ 
+    8. Limitation of Liability. In no event and under no legal theory,
+       whether in tort (including negligence), contract, or otherwise,
+       unless required by applicable law (such as deliberate and grossly
+       negligent acts) or agreed to in writing, shall any Contributor be
+       liable to You for damages, including any direct, indirect, special,
+       incidental, or consequential damages of any character arising as a
+       result of this License or out of the use or inability to use the
+       Work (including but not limited to damages for loss of goodwill,
+       work stoppage, computer failure or malfunction, or any and all
+       other commercial damages or losses), even if such Contributor
+       has been advised of the possibility of such damages.
+ 
+    9. Accepting Warranty or Additional Liability. While redistributing
+       the Work or Derivative Works thereof, You may choose to offer,
+       and charge a fee for, acceptance of support, warranty, indemnity,
+       or other liability obligations and/or rights consistent with this
+       License. However, in accepting such obligations, You may act only
+       on Your own behalf and on Your sole responsibility, not on behalf
+       of any other Contributor, and only if You agree to indemnify,
+       defend, and hold each Contributor harmless for any liability
+       incurred by, or claims asserted against, such Contributor by reason
+       of your accepting any such warranty or additional liability.
+ 
+    END OF TERMS AND CONDITIONS
+ 
+    APPENDIX: How to apply the Apache License to your work.
+ 
+       To apply the Apache License to your work, attach the following
+       boilerplate notice, with the fields enclosed by brackets "[]"
+       replaced with your own identifying information. (Don't include
+       the brackets!)  The text should be enclosed in the appropriate
+       comment syntax for the file format. We also recommend that a
+       file or class name and description of purpose be included on the
+       same "printed page" as the copyright notice for easier
+       identification within third-party archives.
+ 
+    Copyright [yyyy] [name of copyright owner]
+ 
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+ 
+        http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+ 
+ **********
+ 
+ APACHE ACCUMULO SUBCOMPONENTS:
+ 
+ The Apache Accumulo project contains subcomponents with separate copyright
+ 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 includes software from the European Commission project OneLab:
+ 
+ * BloomFilter.java
+ * DynamicBloomFilter.java
+ * Filter.java
+ 
+     Copyright (c) 2005, European Commission project OneLab under contract 034819
+     (http://www.one-lab.org)
+ 
+     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 the University Catholique de Louvain - UCL
+        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.
+ 
+ **********
+ 
+ This product includes JQuery:
+ 
+     Copyright 2011, John Resig
+     Dual licensed under the MIT or GPL Version 2 licenses.
+     http://jquery.org/license
+ 
+     Includes Sizzle.js
+     http://sizzlejs.com/
+     Copyright 2011, The Dojo Foundation
+     Released under the MIT, BSD, and GPL Licenses.
+ 
+     Distributed under the MIT License:
+ 
+     Permission is hereby granted, free of charge, to any person
+     obtaining a copy of this software and associated documentation
+     files (the "Software"), to deal in the Software without
+     restriction, including without limitation the rights to use,
+     copy, modify, merge, publish, distribute, sublicense, and/or sell
+     copies of the Software, and to permit persons to whom the
+     Software is furnished to do so, subject to the following
+     conditions:
+ 
+     The above copyright notice and this permission notice shall be
+     included in all copies or substantial portions of the Software.
+ 
+     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+     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 includes Flot:
+ 
+     Copyright (c) 2007-2009 IOLA and Ole Laursen
+ 
+     Available under the MIT License (see above)
+ 
+     Flot bundles additional works:
+ 
+     jquery.pie.js
+     * Created by Brian Medendorp, June 2009
+     * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+ 
+     jquery.flot.resize.js
+     * Inline dependency:
+      * jQuery resize event - v1.1 - 3/14/2010
+      * http://benalman.com/projects/jquery-resize-plugin/
+      *
+      * Copyright (c) 2010 "Cowboy" Ben Alman
+      * Dual licensed under the MIT and GPL licenses.
+      * http://benalman.com/about/license/
+ 
+     distributed under the MIT license (see above)
+ 
+ **********
+ 
+ This product includes jline:
+ 
+     The BSD License
+ 
+     Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>
+     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 JLine 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.
+ 
+ **********
+ 
+ This product includes Apache Commons Math:
+ 
+     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
+     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
+     THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR
+     IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES
+     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE
+     OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY
+     OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR
+     USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF
+     THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4)
+     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,
+     INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF
+     ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF
+     PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER
+     SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT
+     (INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE,
+     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:
+ 
+ 
+     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.
+ 
+     - 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.
+     ===============================================================================
+ 
+     Copyright and license statement for the original Mersenne twister C
+     routines translated in MersenneTwister class in package
+     org.apache.commons.math.random:
+ 
+        Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+        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
+             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.
+ 
++**********
++
++This product includes Protocol Buffers:
++
++    Copyright 2014, Google Inc. 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 Google Inc. 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.
++
++    Code generated by the Protocol Buffer compiler is owned by the owner
++    of the input file used when generating it. This code is not
++    standalone and requires a support library to be linked with it. This
++    support library is itself covered by the above license.
+ 
+ **********
+ 
+ This product includes slf4j:
+ 
+     Copyright (c) 2004-2013 QOS.ch
+     All rights reserved.
+ 
+     Permission is hereby granted, free  of charge, to any person obtaining
+     a  copy  of this  software  and  associated  documentation files  (the
+     "Software"), to  deal in  the Software without  restriction, including
+     without limitation  the rights to  use, copy, modify,  merge, publish,
+     distribute,  sublicense, and/or sell  copies of  the Software,  and to
+     permit persons to whom the Software  is furnished to do so, subject to
+     the following conditions:
+ 
+     The  above  copyright  notice  and  this permission  notice  shall  be
+     included in all copies or substantial portions of the Software.
+ 
+     THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+     EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+     MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+     LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 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 includes javax.servlet-api (http://servlet-spec.java.net):
+ 
+   COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+ 
+   1. Definitions.
+ 
+      1.1. Contributor. means each individual or entity that creates or
+      contributes to the creation of Modifications.
+ 
+      1.2. Contributor Version. means the combination of the Original Software,
+      prior Modifications used by a Contributor (if any), and the Modifications
+      made by that particular Contributor.
+ 
+      1.3. Covered Software. means (a) the Original Software, or (b)
+      Modifications, or (c) the combination of files containing Original Software
+      with files containing Modifications, in each case including portions thereof.
+ 
+      1.4. Executable. means the Covered Software in any form other than Source
+      Code.
+ 
+      1.5. Initial Developer. means the individual or entity that first makes
+      Original Software available under this License.
+ 
+      1.6. Larger Work. means a work which combines Covered Software or portions
+      thereof with code not governed by the terms of this License.
+ 
+      1.7. License. means this document.
+ 
+      1.8. Licensable. means having the right to grant, to the maximum extent
+      possible, whether at the time of the initial grant or subsequently
+      acquired, any and all of the rights conveyed herein.
+ 
+      1.9. Modifications. means the Source Code and Executable form of any of the
+      following:
+ 
+           A. Any file that results from an addition to, deletion from or
+           modification of the contents of a file containing Original Software or
+           previous Modifications;
+ 
+           B. Any new file that contains any part of the Original Software or
+           previous Modification; or
+ 
+           C. Any new file that is contributed or otherwise made available under
+           the terms of this License.
+ 
+      1.10. Original Software. means the Source Code and Executable form of
+      computer software code that is originally released under this License.
+ 
+      1.11. Patent Claims. means any patent claim(s), now owned or hereafter
+      acquired, including without limitation, method, process, and apparatus
+      claims, in any patent Licensable by grantor.
+ 
+      1.12. Source Code. means (a) the common form of computer software code in
+      which modifications are made and (b) associated documentation included in
+      or with such code.
+ 
+      1.13. You. (or .Your.) means an individual or a legal entity exercising
+      rights under, and complying with all of the terms of, this License. For
+      legal entities, .You. includes any entity which controls, is controlled by,
+      or is under common control with You. For purposes of this definition,
+      .control. means (a) the power, direct or indirect, to cause the direction
+      or management of such entity, whether by contract or otherwise, or (b)
+      ownership of more than fifty percent (50%) of the outstanding shares or
+      beneficial ownership of such entity.
+ 
+   2. License Grants.
+ 
+         2.1. The Initial Developer Grant.
+ 
+         Conditioned upon Your compliance with Section 3.1 below and subject to
+         third party intellectual property claims, the Initial Developer hereby
+         grants You a world-wide, royalty-free, non-exclusive license:
+ 
+            (a) under intellectual property rights (other than patent or
+            trademark) Licensable by Initial Developer, to use, reproduce,
+            modify, display, perform, sublicense and distribute the Original
+            Software (or portions thereof), with or without Modifications, and/or
+            as part of a Larger Work; and
+ 
+            (b) under Patent Claims infringed by the making, using or selling of
+            Original Software, to make, have made, use, practice, sell, and offer
+            for sale, and/or otherwise dispose of the Original Software (or
+            portions thereof).
+ 
+           (c) The licenses granted in Sections 2.1(a) and (b) are effective on
+           the date Initial Developer first distributes or otherwise makes the
+           Original Software available to a third party under the terms of this
+           License.
+ 
+           (d) Notwithstanding Section 2.1(b) above, no patent license is
+           granted: (1) for code that You delete from the Original Software, or
+           (2) for infringements caused by: (i) the modification of the Original
+           Software, or (ii) the combination of the Original Software with other
+           software or devices.
+ 
+       2.2. Contributor Grant.
+ 
+       Conditioned upon Your compliance with Section 3.1 below and subject to
+       third party intellectual property claims, each Contributor hereby grants
+       You a world-wide, royalty-free, non-exclusive license:
+ 
+           (a) under intellectual property rights (other than patent or
+           trademark) Licensable by Contributor to use, reproduce, modify,
+           display, perform, sublicense and distribute the Modifications created
+           by such Contributor (or portions thereof), either on an unmodified
+           basis, with other Modifications, as Covered Software and/or as part of
+           a Larger Work; and
+ 
+           (b) under Patent Claims infringed by the making, using, or selling of
+           Modifications made by that Contributor either alone and/or in
+           combination with its Contributor Version (or portions of such
+           combination), to make, use, sell, offer for sale, have made,
+           and/or otherwise dispose of: (1) Modifications made by that
+           Contributor (or portions thereof); and (2) the combination of
+           Modifications made by that Contributor with its Contributor Version
+           (or portions of such combination).
+ 
+           (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
+           on the date Contributor first distributes or otherwise makes the
+           Modifications available to a third party.
+ 
+           (d) Notwithstanding Section 2.2(b) above, no patent license is
+           granted: (1) for any code that Contributor has deleted from the
+           Contributor Version; (2) for infringements caused by: (i) third party
+           modifications of Contributor Version, or (ii) the combination of
+           Modifications made by that Contributor with other software (except as
+           part of the Contributor Version) or other devices; or (3) under
+           Patent Claims infringed by Covered Software in the absence of
+           Modifications made by that Contributor.
+ 
+   3. Distribution Obligations.
+ 
+         3.1. Availability of Source Code.  Any Covered Software that You
+         distribute or otherwise make available in Executable form must also be
+         made available in Source Code form and that Source Code form must be
+         distributed only under the terms of this License. You must include a
+         copy of this License with every copy of the Source Code form of the
+         Covered Software You distribute or otherwise make available. You must
+         inform recipients of any such Covered Software in Executable form as to
+         how they can obtain such Covered Software in Source Code form in a
+         reasonable manner on or through a medium customarily used for software
+         exchange.
+ 
+         3.2. Modifications.  The Modifications that You create or to which You
+         contribute are governed by the terms of this License. You represent that
+         You believe Your Modifications are Your original creation(s) and/or You
+         have sufficient rights to grant the rights conveyed by this License.
+ 
+         3.3. Required Notices.  You must include a notice in each of Your
+         Modifications that identifies You as the Contributor of the
+         Modification. You may not remove or alter any copyright, patent or
+         trademark notices contained within the Covered Software, or any notices
+         of licensing or any descriptive text giving attribution to any
+         Contributor or the Initial Developer.
+ 
+         3.4. Application of Additional Terms.  You may not offer or impose any
+         terms on any Covered Software in Source Code form that alters or
+         restricts the applicable version of this License or the recipients.
+         rights hereunder.  You may choose to offer, and to charge a fee for,
+         warranty, support, indemnity or liability obligations to one or more
+         recipients of Covered Software. However, you may do so only on Your own
+         behalf, and not on behalf of the Initial Developer or any Contributor.
+         You must make it absolutely clear that any such warranty, support,
+         indemnity or liability obligation is offered by You alone, and You
+         hereby agree to indemnify the Initial Developer and every Contributor
+         for any liability incurred by the Initial Developer or such Contributor
+         as a result of warranty, support, indemnity or liability terms You
+         offer.
+ 
+         3.5. Distribution of Executable Versions.  You may distribute the
+         Executable form of the Covered Software under the terms of this License
+         or under the terms of a license of Your choice, which may contain terms
+         different from this License, provided that You are in compliance with
+         the terms of this License and that the license for the Executable form
+         does not attempt to limit or alter the recipient.s rights in the Source
+         Code form from the rights set forth in this License. If You distribute
+         the Covered Software in Executable form under a different license, You
+         must make it absolutely clear that any terms which differ from this
+         License are offered by You alone, not by the Initial Developer or
+         Contributor. You hereby agree to indemnify the Initial Developer and
+         every Contributor for any liability incurred by the Initial Developer or
+         such Contributor as a result of any such terms You offer.
+ 
+         3.6. Larger Works.  You may create a Larger Work by combining Covered
+         Software with other code not governed by the terms of this License and
+         distribute the Larger Work as a single product. In such a case, You must
+         make sure the requirements of this License are fulfilled for the Covered
+         Software.
+ 
+   4. Versions of the License.
+ 
+         4.1. New Versions.  Sun Microsystems, Inc. is the initial license
+         steward and may publish revised and/or new versions of this License from
+         time to time. Each version will be given a distinguishing version
+         number. Except as provided in Section 4.3, no one other than the license
+         steward has the right to modify this License.
+ 
+         4.2. Effect of New Versions.  You may always continue to use, distribute
+         or otherwise make the Covered Software available under the terms of the
+         version of the License under which You originally received the Covered
+         Software. If the Initial Developer includes a notice in the Original
+         Software prohibiting it from being distributed or otherwise made
+         available under any subsequent version of the License, You must
+         distribute and make the Covered Software available under the terms of
+         the version of the License under which You originally received the
+         Covered Software. Otherwise, You may also choose to use, distribute or
+         otherwise make the Covered Software available under the terms of any
+         subsequent version of the License published by the license steward.
+ 
+         4.3. Modified Versions.  When You are an Initial Developer and You want
+         to create a new license for Your Original Software, You may create and
+         use a modified version of this License if You: (a) rename the license
+         and remove any references to the name of the license steward (except to
+         note that the license differs from this License); and (b) otherwise
+         make it clear that the license contains terms which differ from this
+         License.
+ 
+   5. DISCLAIMER OF WARRANTY.
+ 
+      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS,
+      WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+      WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
+      DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE
+      ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS
+      WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU
+      (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
+      NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY
+      CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
+      SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+ 
+   6. TERMINATION.
+ 
+         6.1. This License and the rights granted hereunder will terminate
+         automatically if You fail to comply with terms herein and fail to cure
+         such breach within 30 days of becoming aware of the breach. Provisions
+         which, by their nature, must remain in effect beyond the termination of
+         this License shall survive.
+ 
+         6.2. If You assert a patent infringement claim (excluding declaratory
+         judgment actions) against Initial Developer or a Contributor (the
+         Initial Developer or Contributor against whom You assert such
+         claim is referred to as .Participant.) alleging that the
+         Participant Software (meaning the Contributor Version where the
+         Participant is a Contributor or the Original Software where the
+         Participant is the Initial Developer) directly or indirectly
+         infringes any patent, then any and all rights granted directly or
+         indirectly to You by such Participant, the Initial Developer (if the
+         Initial Developer is not the Participant) and all Contributors
+         under Sections 2.1 and/or 2.2 of this License shall, upon 60 days
+         notice from Participant terminate prospectively and automatically at
+         the expiration of such 60 day notice period, unless if within such
+         60 day period You withdraw Your claim with respect to the
+         Participant Software against such Participant either unilaterally or
+         pursuant to a written agreement with Participant.
+ 
+         6.3. In the event of termination under Sections 6.1 or 6.2 above, all
+         end user licenses that have been validly granted by You or any
+         distributor hereunder prior to termination (excluding licenses granted
+         to You by any distributor) shall survive termination.
+ 
+   7. LIMITATION OF LIABILITY.
+ 
+      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
+      NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER,
+      ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY
+      SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT,
+      SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING,
+      WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
+      STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL
+      DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
+      POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY
+      TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY.S
+      NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME
+      JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+      CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
+      YOU.
+ 
+   8. U.S. GOVERNMENT END USERS.
+ 
+      The Covered Software is a .commercial item,. as that term is defined in 48
+      C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as
+      that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and .commercial
+      computer software documentation. as such terms are used in 48 C.F.R. 12.212
+      (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+      through 227.7202-4 (June 1995), all U.S. Government End Users acquire
+      Covered Software with only those rights set forth herein. This U.S.
+      Government Rights clause is in lieu of, and supersedes, any other FAR,
+      DFAR, or other clause or provision that addresses Government rights in
+      computer software under this License.
+ 
+   9. MISCELLANEOUS.
+ 
+      This License represents the complete agreement concerning subject matter
+      hereof. If any provision of this License is held to be unenforceable, such
+      provision shall be reformed only to the extent necessary to make it
+      enforceable.  This License shall be governed by the law of the jurisdiction
+      specified in a notice contained within the Original Software (except to the
+      extent applicable law, if any, provides otherwise), excluding such
+      jurisdiction.s conflict-of-law provisions. Any litigation relating to this
+      License shall be subject to the jurisdiction of the courts located in the
+      jurisdiction and venue specified in a notice contained within the Original
+      Software, with the losing party responsible for costs, including, without
+      limitation, court costs and reasonable attorneys. fees and expenses. The
+      application of the United Nations Convention on Contracts for the
+      International Sale of Goods is expressly excluded. Any law or regulation
+      which provides that the language of a contract shall be construed against
+      the drafter shall not apply to this License. You agree that You alone are
+      responsible for compliance with the United States export administration
+      regulations (and the export control laws and regulation of any other countries)
+      when You use, distribute or otherwise make available any Covered Software.
+ 
+   10. RESPONSIBILITY FOR CLAIMS.
+ 
+      As between Initial Developer and the Contributors, each party is
+      responsible for claims and damages arising, directly or indirectly, out of
+      its utilization of rights under this License and You agree to work with
+      Initial Developer and Contributors to distribute such responsibility on an
+      equitable basis. Nothing herein is intended or shall be deemed to
+      constitute any admission of liability.
+ 
+      NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
+      LICENSE (CDDL)
+ 
+      The code released under the CDDL shall be governed by the laws of the State
+      of California (excluding conflict-of-law provisions). Any litigation
+      relating to this License shall be subject to the jurisdiction of the
+      Federal Courts of the Northern District of California and the state courts
+      of the State of California, with venue lying in Santa Clara County,
+      California.
+ 
+ **********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/core/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/examples/simple/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/server/base/pom.xml
----------------------------------------------------------------------
diff --cc server/base/pom.xml
index 6096017,7b11aa1..288b359
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@@ -127,59 -118,5 +127,30 @@@
          <directory>src/test/resources</directory>
        </testResource>
      </testResources>
-     <plugins>
-       <plugin>
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-resources-plugin</artifactId>
-         <executions>
-           <execution>
-             <id>license-javadocs</id>
-             <goals>
-               <goal>copy-resources</goal>
-             </goals>
-             <phase>prepare-package</phase>
-             <configuration>
-               <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
-               <resources>
-                 <resource>
-                   <directory>src/main/javadoc/META-INF/</directory>
-                   <targetPath>META-INF/</targetPath>
-                   <includes>
-                     <include>LICENSE</include>
-                     <include>NOTICE</include>
-                   </includes>
-                   <filtering>true</filtering>
-                 </resource>
-               </resources>
-             </configuration>
-           </execution>
-         </executions>
-       </plugin>
-     </plugins>
    </build>
 +  <profiles>
 +    <profile>
 +      <id>protobuf</id>
 +      <build>
 +        <plugins>
 +          <plugin>
 +            <groupId>org.codehaus.mojo</groupId>
 +            <artifactId>exec-maven-plugin</artifactId>
 +            <executions>
 +              <execution>
 +                <id>generate-protobuf</id>
 +                <goals>
 +                  <goal>exec</goal>
 +                </goals>
 +                <phase>generate-sources</phase>
 +                <configuration>
 +                  <executable>${basedir}/src/main/scripts/generate-protobuf.sh</executable>
 +                </configuration>
 +              </execution>
 +            </executions>
 +          </plugin>
 +        </plugins>
 +      </build>
 +    </profile>
 +  </profiles>
  </project>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/server/monitor/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/server/tserver/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/shell/pom.xml
----------------------------------------------------------------------
diff --cc shell/pom.xml
index 85bc740,0000000..a102d1e
mode 100644,000000..100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@@ -1,145 -1,0 +1,128 @@@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!--
 +  Licensed to the Apache Software Foundation (ASF) under one or more
 +  contributor license agreements.  See the NOTICE file distributed with
 +  this work for additional information regarding copyright ownership.
 +  The ASF licenses this file to You under the Apache License, Version 2.0
 +  (the "License"); you may not use this file except in compliance with
 +  the License.  You may obtain a copy of the License at
 +
 +      http://www.apache.org/licenses/LICENSE-2.0
 +
 +  Unless required by applicable law or agreed to in writing, software
 +  distributed under the License is distributed on an "AS IS" BASIS,
 +  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 +  See the License for the specific language governing permissions and
 +  limitations under the License.
 +-->
 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 +  <modelVersion>4.0.0</modelVersion>
 +  <parent>
 +    <groupId>org.apache.accumulo</groupId>
 +    <artifactId>accumulo-project</artifactId>
 +    <version>1.7.3-SNAPSHOT</version>
 +  </parent>
 +  <artifactId>accumulo-shell</artifactId>
 +  <name>Apache Accumulo Shell</name>
 +  <description>An interactive shell for accessing Apache Accumulo via a command line interface.</description>
 +  <dependencies>
 +    <dependency>
 +      <groupId>com.beust</groupId>
 +      <artifactId>jcommander</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>com.google.auto.service</groupId>
 +      <artifactId>auto-service</artifactId>
 +      <optional>true</optional>
 +    </dependency>
 +    <dependency>
 +      <groupId>com.google.guava</groupId>
 +      <artifactId>guava</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-cli</groupId>
 +      <artifactId>commons-cli</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-codec</groupId>
 +      <artifactId>commons-codec</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-collections</groupId>
 +      <artifactId>commons-collections</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-configuration</groupId>
 +      <artifactId>commons-configuration</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-io</groupId>
 +      <artifactId>commons-io</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-lang</groupId>
 +      <artifactId>commons-lang</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>jline</groupId>
 +      <artifactId>jline</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>log4j</groupId>
 +      <artifactId>log4j</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.accumulo</groupId>
 +      <artifactId>accumulo-core</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.accumulo</groupId>
 +      <artifactId>accumulo-fate</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.accumulo</groupId>
 +      <artifactId>accumulo-start</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.accumulo</groupId>
 +      <artifactId>accumulo-tracer</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.commons</groupId>
 +      <artifactId>commons-vfs2</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.hadoop</groupId>
 +      <artifactId>hadoop-client</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.thrift</groupId>
 +      <artifactId>libthrift</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>junit</groupId>
 +      <artifactId>junit</artifactId>
 +      <scope>test</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.easymock</groupId>
 +      <artifactId>easymock</artifactId>
 +      <scope>test</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.powermock</groupId>
 +      <artifactId>powermock-api-easymock</artifactId>
 +      <scope>test</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.powermock</groupId>
 +      <artifactId>powermock-core</artifactId>
 +      <scope>test</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.powermock</groupId>
 +      <artifactId>powermock-module-junit4</artifactId>
 +      <scope>test</scope>
 +    </dependency>
 +  </dependencies>
-   <build>
-     <pluginManagement>
-       <plugins>
-         <plugin>
-           <groupId>org.apache.rat</groupId>
-           <artifactId>apache-rat-plugin</artifactId>
-           <configuration>
-             <excludes>
-               <exclude>nbproject/**</exclude>
-               <exclude>nb-configuration.xml</exclude>
-               <exclude>nbactions.xml</exclude>
-             </excludes>
-           </configuration>
-         </plugin>
-       </plugins>
-     </pluginManagement>
-   </build>
 +</project>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/test/pom.xml
----------------------------------------------------------------------
diff --cc test/pom.xml
index 032b97d,e3cba7e..4c73f89
--- a/test/pom.xml
+++ b/test/pom.xml
@@@ -201,12 -181,8 +201,9 @@@
            <artifactId>apache-rat-plugin</artifactId>
            <configuration>
              <excludes>
 +              <exclude>compat/japi-compliance/exclude_classes.txt</exclude>
                <exclude>system/bench/lib/*splits</exclude>
                <exclude>system/continuous/*.txt</exclude>
-               <exclude>nbproject/**</exclude>
-               <exclude>nb-configuration.xml</exclude>
-               <exclude>nbactions.xml</exclude>
              </excludes>
            </configuration>
          </plugin>


[09/18] accumulo git commit: ACCUMULO-4384 Simplify rat excludes

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/src/main/resources/LICENSE
----------------------------------------------------------------------
diff --git a/assemble/src/main/resources/LICENSE b/assemble/src/main/resources/LICENSE
new file mode 100644
index 0000000..9cfab86
--- /dev/null
+++ b/assemble/src/main/resources/LICENSE
@@ -0,0 +1,883 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+**********
+
+APACHE ACCUMULO SUBCOMPONENTS:
+
+The Apache Accumulo project contains subcomponents with separate copyright
+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 includes software from the European Commission project OneLab:
+
+* BloomFilter.java
+* DynamicBloomFilter.java
+* Filter.java
+
+    Copyright (c) 2005, European Commission project OneLab under contract 034819
+    (http://www.one-lab.org)
+
+    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 the University Catholique de Louvain - UCL
+       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.
+
+**********
+
+This product includes JQuery:
+
+    Copyright 2011, John Resig
+    Dual licensed under the MIT or GPL Version 2 licenses.
+    http://jquery.org/license
+
+    Includes Sizzle.js
+    http://sizzlejs.com/
+    Copyright 2011, The Dojo Foundation
+    Released under the MIT, BSD, and GPL Licenses.
+
+    Distributed under the MIT License:
+
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use,
+    copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following
+    conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    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 includes Flot:
+
+    Copyright (c) 2007-2009 IOLA and Ole Laursen
+
+    Available under the MIT License (see above)
+
+    Flot bundles additional works:
+
+    jquery.pie.js
+    * Created by Brian Medendorp, June 2009
+    * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+
+    jquery.flot.resize.js
+    * Inline dependency:
+     * jQuery resize event - v1.1 - 3/14/2010
+     * http://benalman.com/projects/jquery-resize-plugin/
+     *
+     * Copyright (c) 2010 "Cowboy" Ben Alman
+     * Dual licensed under the MIT and GPL licenses.
+     * http://benalman.com/about/license/
+
+    distributed under the MIT license (see above)
+
+**********
+
+This product includes jline:
+
+    The BSD License
+
+    Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>
+    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 JLine 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.
+
+**********
+
+This product includes Apache Commons Math:
+
+    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
+    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
+    THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE
+    OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY
+    OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR
+    USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF
+    THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4)
+    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,
+    INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF
+    ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF
+    PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER
+    SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT
+    (INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE,
+    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:
+
+
+    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.
+
+    - 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.
+    ===============================================================================
+
+    Copyright and license statement for the original Mersenne twister C
+    routines translated in MersenneTwister class in package
+    org.apache.commons.math.random:
+
+       Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+       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
+            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.
+
+
+**********
+
+This product includes slf4j:
+
+    Copyright (c) 2004-2013 QOS.ch
+    All rights reserved.
+
+    Permission is hereby granted, free  of charge, to any person obtaining
+    a  copy  of this  software  and  associated  documentation files  (the
+    "Software"), to  deal in  the Software without  restriction, including
+    without limitation  the rights to  use, copy, modify,  merge, publish,
+    distribute,  sublicense, and/or sell  copies of  the Software,  and to
+    permit persons to whom the Software  is furnished to do so, subject to
+    the following conditions:
+
+    The  above  copyright  notice  and  this permission  notice  shall  be
+    included in all copies or substantial portions of the Software.
+
+    THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+    EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+    MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 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 includes javax.servlet-api (http://servlet-spec.java.net):
+
+  COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+  1. Definitions.
+
+     1.1. Contributor. means each individual or entity that creates or
+     contributes to the creation of Modifications.
+
+     1.2. Contributor Version. means the combination of the Original Software,
+     prior Modifications used by a Contributor (if any), and the Modifications
+     made by that particular Contributor.
+
+     1.3. Covered Software. means (a) the Original Software, or (b)
+     Modifications, or (c) the combination of files containing Original Software
+     with files containing Modifications, in each case including portions thereof.
+
+     1.4. Executable. means the Covered Software in any form other than Source
+     Code.
+
+     1.5. Initial Developer. means the individual or entity that first makes
+     Original Software available under this License.
+
+     1.6. Larger Work. means a work which combines Covered Software or portions
+     thereof with code not governed by the terms of this License.
+
+     1.7. License. means this document.
+
+     1.8. Licensable. means having the right to grant, to the maximum extent
+     possible, whether at the time of the initial grant or subsequently
+     acquired, any and all of the rights conveyed herein.
+
+     1.9. Modifications. means the Source Code and Executable form of any of the
+     following:
+
+          A. Any file that results from an addition to, deletion from or
+          modification of the contents of a file containing Original Software or
+          previous Modifications;
+
+          B. Any new file that contains any part of the Original Software or
+          previous Modification; or
+
+          C. Any new file that is contributed or otherwise made available under
+          the terms of this License.
+
+     1.10. Original Software. means the Source Code and Executable form of
+     computer software code that is originally released under this License.
+
+     1.11. Patent Claims. means any patent claim(s), now owned or hereafter
+     acquired, including without limitation, method, process, and apparatus
+     claims, in any patent Licensable by grantor.
+
+     1.12. Source Code. means (a) the common form of computer software code in
+     which modifications are made and (b) associated documentation included in
+     or with such code.
+
+     1.13. You. (or .Your.) means an individual or a legal entity exercising
+     rights under, and complying with all of the terms of, this License. For
+     legal entities, .You. includes any entity which controls, is controlled by,
+     or is under common control with You. For purposes of this definition,
+     .control. means (a) the power, direct or indirect, to cause the direction
+     or management of such entity, whether by contract or otherwise, or (b)
+     ownership of more than fifty percent (50%) of the outstanding shares or
+     beneficial ownership of such entity.
+
+  2. License Grants.
+
+        2.1. The Initial Developer Grant.
+
+        Conditioned upon Your compliance with Section 3.1 below and subject to
+        third party intellectual property claims, the Initial Developer hereby
+        grants You a world-wide, royalty-free, non-exclusive license:
+
+           (a) under intellectual property rights (other than patent or
+           trademark) Licensable by Initial Developer, to use, reproduce,
+           modify, display, perform, sublicense and distribute the Original
+           Software (or portions thereof), with or without Modifications, and/or
+           as part of a Larger Work; and
+
+           (b) under Patent Claims infringed by the making, using or selling of
+           Original Software, to make, have made, use, practice, sell, and offer
+           for sale, and/or otherwise dispose of the Original Software (or
+           portions thereof).
+
+          (c) The licenses granted in Sections 2.1(a) and (b) are effective on
+          the date Initial Developer first distributes or otherwise makes the
+          Original Software available to a third party under the terms of this
+          License.
+
+          (d) Notwithstanding Section 2.1(b) above, no patent license is
+          granted: (1) for code that You delete from the Original Software, or
+          (2) for infringements caused by: (i) the modification of the Original
+          Software, or (ii) the combination of the Original Software with other
+          software or devices.
+
+      2.2. Contributor Grant.
+
+      Conditioned upon Your compliance with Section 3.1 below and subject to
+      third party intellectual property claims, each Contributor hereby grants
+      You a world-wide, royalty-free, non-exclusive license:
+
+          (a) under intellectual property rights (other than patent or
+          trademark) Licensable by Contributor to use, reproduce, modify,
+          display, perform, sublicense and distribute the Modifications created
+          by such Contributor (or portions thereof), either on an unmodified
+          basis, with other Modifications, as Covered Software and/or as part of
+          a Larger Work; and
+
+          (b) under Patent Claims infringed by the making, using, or selling of
+          Modifications made by that Contributor either alone and/or in
+          combination with its Contributor Version (or portions of such
+          combination), to make, use, sell, offer for sale, have made,
+          and/or otherwise dispose of: (1) Modifications made by that
+          Contributor (or portions thereof); and (2) the combination of
+          Modifications made by that Contributor with its Contributor Version
+          (or portions of such combination).
+
+          (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
+          on the date Contributor first distributes or otherwise makes the
+          Modifications available to a third party.
+
+          (d) Notwithstanding Section 2.2(b) above, no patent license is
+          granted: (1) for any code that Contributor has deleted from the
+          Contributor Version; (2) for infringements caused by: (i) third party
+          modifications of Contributor Version, or (ii) the combination of
+          Modifications made by that Contributor with other software (except as
+          part of the Contributor Version) or other devices; or (3) under
+          Patent Claims infringed by Covered Software in the absence of
+          Modifications made by that Contributor.
+
+  3. Distribution Obligations.
+
+        3.1. Availability of Source Code.  Any Covered Software that You
+        distribute or otherwise make available in Executable form must also be
+        made available in Source Code form and that Source Code form must be
+        distributed only under the terms of this License. You must include a
+        copy of this License with every copy of the Source Code form of the
+        Covered Software You distribute or otherwise make available. You must
+        inform recipients of any such Covered Software in Executable form as to
+        how they can obtain such Covered Software in Source Code form in a
+        reasonable manner on or through a medium customarily used for software
+        exchange.
+
+        3.2. Modifications.  The Modifications that You create or to which You
+        contribute are governed by the terms of this License. You represent that
+        You believe Your Modifications are Your original creation(s) and/or You
+        have sufficient rights to grant the rights conveyed by this License.
+
+        3.3. Required Notices.  You must include a notice in each of Your
+        Modifications that identifies You as the Contributor of the
+        Modification. You may not remove or alter any copyright, patent or
+        trademark notices contained within the Covered Software, or any notices
+        of licensing or any descriptive text giving attribution to any
+        Contributor or the Initial Developer.
+
+        3.4. Application of Additional Terms.  You may not offer or impose any
+        terms on any Covered Software in Source Code form that alters or
+        restricts the applicable version of this License or the recipients.
+        rights hereunder.  You may choose to offer, and to charge a fee for,
+        warranty, support, indemnity or liability obligations to one or more
+        recipients of Covered Software. However, you may do so only on Your own
+        behalf, and not on behalf of the Initial Developer or any Contributor.
+        You must make it absolutely clear that any such warranty, support,
+        indemnity or liability obligation is offered by You alone, and You
+        hereby agree to indemnify the Initial Developer and every Contributor
+        for any liability incurred by the Initial Developer or such Contributor
+        as a result of warranty, support, indemnity or liability terms You
+        offer.
+
+        3.5. Distribution of Executable Versions.  You may distribute the
+        Executable form of the Covered Software under the terms of this License
+        or under the terms of a license of Your choice, which may contain terms
+        different from this License, provided that You are in compliance with
+        the terms of this License and that the license for the Executable form
+        does not attempt to limit or alter the recipient.s rights in the Source
+        Code form from the rights set forth in this License. If You distribute
+        the Covered Software in Executable form under a different license, You
+        must make it absolutely clear that any terms which differ from this
+        License are offered by You alone, not by the Initial Developer or
+        Contributor. You hereby agree to indemnify the Initial Developer and
+        every Contributor for any liability incurred by the Initial Developer or
+        such Contributor as a result of any such terms You offer.
+
+        3.6. Larger Works.  You may create a Larger Work by combining Covered
+        Software with other code not governed by the terms of this License and
+        distribute the Larger Work as a single product. In such a case, You must
+        make sure the requirements of this License are fulfilled for the Covered
+        Software.
+
+  4. Versions of the License.
+
+        4.1. New Versions.  Sun Microsystems, Inc. is the initial license
+        steward and may publish revised and/or new versions of this License from
+        time to time. Each version will be given a distinguishing version
+        number. Except as provided in Section 4.3, no one other than the license
+        steward has the right to modify this License.
+
+        4.2. Effect of New Versions.  You may always continue to use, distribute
+        or otherwise make the Covered Software available under the terms of the
+        version of the License under which You originally received the Covered
+        Software. If the Initial Developer includes a notice in the Original
+        Software prohibiting it from being distributed or otherwise made
+        available under any subsequent version of the License, You must
+        distribute and make the Covered Software available under the terms of
+        the version of the License under which You originally received the
+        Covered Software. Otherwise, You may also choose to use, distribute or
+        otherwise make the Covered Software available under the terms of any
+        subsequent version of the License published by the license steward.
+
+        4.3. Modified Versions.  When You are an Initial Developer and You want
+        to create a new license for Your Original Software, You may create and
+        use a modified version of this License if You: (a) rename the license
+        and remove any references to the name of the license steward (except to
+        note that the license differs from this License); and (b) otherwise
+        make it clear that the license contains terms which differ from this
+        License.
+
+  5. DISCLAIMER OF WARRANTY.
+
+     COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE
+     ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS
+     WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU
+     (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
+     NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY
+     CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
+     SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+  6. TERMINATION.
+
+        6.1. This License and the rights granted hereunder will terminate
+        automatically if You fail to comply with terms herein and fail to cure
+        such breach within 30 days of becoming aware of the breach. Provisions
+        which, by their nature, must remain in effect beyond the termination of
+        this License shall survive.
+
+        6.2. If You assert a patent infringement claim (excluding declaratory
+        judgment actions) against Initial Developer or a Contributor (the
+        Initial Developer or Contributor against whom You assert such
+        claim is referred to as .Participant.) alleging that the
+        Participant Software (meaning the Contributor Version where the
+        Participant is a Contributor or the Original Software where the
+        Participant is the Initial Developer) directly or indirectly
+        infringes any patent, then any and all rights granted directly or
+        indirectly to You by such Participant, the Initial Developer (if the
+        Initial Developer is not the Participant) and all Contributors
+        under Sections 2.1 and/or 2.2 of this License shall, upon 60 days
+        notice from Participant terminate prospectively and automatically at
+        the expiration of such 60 day notice period, unless if within such
+        60 day period You withdraw Your claim with respect to the
+        Participant Software against such Participant either unilaterally or
+        pursuant to a written agreement with Participant.
+
+        6.3. In the event of termination under Sections 6.1 or 6.2 above, all
+        end user licenses that have been validly granted by You or any
+        distributor hereunder prior to termination (excluding licenses granted
+        to You by any distributor) shall survive termination.
+
+  7. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
+     NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER,
+     ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY
+     SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT,
+     SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING,
+     WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
+     STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL
+     DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
+     POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY
+     TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY.S
+     NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME
+     JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+     CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
+     YOU.
+
+  8. U.S. GOVERNMENT END USERS.
+
+     The Covered Software is a .commercial item,. as that term is defined in 48
+     C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as
+     that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and .commercial
+     computer software documentation. as such terms are used in 48 C.F.R. 12.212
+     (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+     through 227.7202-4 (June 1995), all U.S. Government End Users acquire
+     Covered Software with only those rights set forth herein. This U.S.
+     Government Rights clause is in lieu of, and supersedes, any other FAR,
+     DFAR, or other clause or provision that addresses Government rights in
+     computer software under this License.
+
+  9. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject matter
+     hereof. If any provision of this License is held to be unenforceable, such
+     provision shall be reformed only to the extent necessary to make it
+     enforceable.  This License shall be governed by the law of the jurisdiction
+     specified in a notice contained within the Original Software (except to the
+     extent applicable law, if any, provides otherwise), excluding such
+     jurisdiction.s conflict-of-law provisions. Any litigation relating to this
+     License shall be subject to the jurisdiction of the courts located in the
+     jurisdiction and venue specified in a notice contained within the Original
+     Software, with the losing party responsible for costs, including, without
+     limitation, court costs and reasonable attorneys. fees and expenses. The
+     application of the United Nations Convention on Contracts for the
+     International Sale of Goods is expressly excluded. Any law or regulation
+     which provides that the language of a contract shall be construed against
+     the drafter shall not apply to this License. You agree that You alone are
+     responsible for compliance with the United States export administration
+     regulations (and the export control laws and regulation of any other countries)
+     when You use, distribute or otherwise make available any Covered Software.
+
+  10. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is
+     responsible for claims and damages arising, directly or indirectly, out of
+     its utilization of rights under this License and You agree to work with
+     Initial Developer and Contributors to distribute such responsibility on an
+     equitable basis. Nothing herein is intended or shall be deemed to
+     constitute any admission of liability.
+
+     NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
+     LICENSE (CDDL)
+
+     The code released under the CDDL shall be governed by the laws of the State
+     of California (excluding conflict-of-law provisions). Any litigation
+     relating to this License shall be subject to the jurisdiction of the
+     Federal Courts of the Northern District of California and the state courts
+     of the State of California, with venue lying in Santa Clara County,
+     California.
+
+**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/assemble/src/main/resources/NOTICE b/assemble/src/main/resources/NOTICE
new file mode 100644
index 0000000..f6370f2
--- /dev/null
+++ b/assemble/src/main/resources/NOTICE
@@ -0,0 +1,61 @@
+Apache Accumulo
+Copyright 2011-2016 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+**********
+
+This product includes JCommander (https://github.com/cbeust/jcommander),
+Copyright 2010 Cedric Beust cedric@beust.com.
+
+**********
+
+This product includes Apache Commons Math (https://commons.apache.org/proper/commons-math/).
+Copyright 2001-2010 The Apache Software Foundation
+
+From commons-math NOTICE.txt:
+
+    ===============================================================================
+    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
+    ===============================================================================
+
+    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.
+    ===============================================================================
+
+    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 Jetty (http://eclipse.org/jetty)
+Copyright 1996-2009 Mort Bay Consulting Pty. Ltd.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 30468da..b701d8a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -166,16 +166,8 @@
           <configuration>
             <excludes>
               <exclude>src/test/resources/shelltest.txt</exclude>
-              <exclude>src/test/resources/org/apache/accumulo/core/file/rfile/ver_3.rf</exclude>
-              <exclude>src/test/resources/org/apache/accumulo/core/file/rfile/ver_4.rf</exclude>
-              <exclude>src/test/resources/org/apache/accumulo/core/file/rfile/ver_6.rf</exclude>
-              <exclude>src/test/resources/site-cfg.jceks</exclude>
-              <exclude>src/test/resources/accumulo.jceks</exclude>
-              <exclude>src/test/resources/empty.jceks</exclude>
-              <exclude>src/test/resources/passwords.jceks</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
+              <exclude>src/test/resources/org/apache/accumulo/core/file/rfile/*.rf</exclude>
+              <exclude>src/test/resources/*.jceks</exclude>
             </excludes>
           </configuration>
         </plugin>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/examples/simple/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml
index 15e9951..2dd75eb 100644
--- a/examples/simple/pom.xml
+++ b/examples/simple/pom.xml
@@ -89,18 +89,6 @@
             <skip>true</skip>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <configuration>
-            <excludes>
-              <exclude>src/main/resources/META-INF/services/org.apache.accumulo.core.util.shell.ShellExtension</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6b29f4c..3027270 100644
--- a/pom.xml
+++ b/pom.xml
@@ -753,7 +753,8 @@
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
           <configuration>
-            <excludes>
+            <excludes combine.children="append">
+              <exclude>src/main/resources/META-INF/services/*</exclude>
               <exclude>nbproject/**</exclude>
               <exclude>nb-configuration.xml</exclude>
               <exclude>nbactions.xml</exclude>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/server/monitor/pom.xml
----------------------------------------------------------------------
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index 09df0e8..782085a 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -134,9 +134,6 @@
           <configuration>
             <excludes>
               <exclude>src/main/resources/web/flot/**/*.js</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
             </excludes>
           </configuration>
         </plugin>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/server/tserver/pom.xml
----------------------------------------------------------------------
diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml
index fc1c9fb..56366b5 100644
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@ -117,9 +117,6 @@
             <excludes>
               <exclude>src/test/resources/*.walog</exclude>
               <exclude>src/test/resources/walog-from-14/*</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
             </excludes>
           </configuration>
         </plugin>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 4f56790..e3cba7e 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -183,9 +183,6 @@
             <excludes>
               <exclude>system/bench/lib/*splits</exclude>
               <exclude>system/continuous/*.txt</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
             </excludes>
           </configuration>
         </plugin>


[13/18] accumulo git commit: Merge branch '1.6' into 1.7

Posted by ct...@apache.org.
Merge branch '1.6' into 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f6465ac3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f6465ac3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f6465ac3

Branch: refs/heads/1.8
Commit: f6465ac3c3fee340fce5df4ebd6ce56487b25518
Parents: 612ede6 0fdd52a
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Jul 21 18:22:25 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jul 21 18:22:25 2016 -0400

----------------------------------------------------------------------
 LICENSE                                         | 109 ++-
 NOTICE                                          |   7 -
 assemble/bin-LICENSE                            | 924 -------------------
 assemble/bin-NOTICE                             |  59 --
 assemble/pom.xml                                |  17 -
 assemble/src/main/assemblies/component.xml      |  22 +-
 assemble/src/main/resources/LICENSE             | 921 ++++++++++++++++++
 assemble/src/main/resources/NOTICE              |  61 ++
 core/pom.xml                                    |  12 +-
 .../main/appended-resources/META-INF/LICENSE    |  71 +-
 examples/simple/pom.xml                         |  12 -
 pom.xml                                         |   3 +-
 server/base/pom.xml                             |  29 -
 .../src/main/appended-resources/META-INF/NOTICE |   9 -
 server/base/src/main/javadoc/META-INF/LICENSE   | 202 ----
 server/base/src/main/javadoc/META-INF/NOTICE    |   5 -
 server/monitor/pom.xml                          |   3 -
 .../main/appended-resources/META-INF/LICENSE    | 100 +-
 server/monitor/src/main/javadoc/META-INF/NOTICE |   5 -
 server/native/src/main/resources/LICENSE        |   1 -
 server/native/src/main/resources/NOTICE         |   2 +-
 server/tserver/pom.xml                          |  32 -
 shell/pom.xml                                   |  17 -
 test/pom.xml                                    |   3 -
 24 files changed, 1142 insertions(+), 1484 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/assemble/pom.xml
----------------------------------------------------------------------
diff --cc assemble/pom.xml
index 1ee64b4,c9bd8c5..58016ef
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@@ -170,47 -162,8 +170,30 @@@
      </dependency>
    </dependencies>
    <build>
-     <pluginManagement>
-       <plugins>
-         <plugin>
-           <groupId>org.apache.rat</groupId>
-           <artifactId>apache-rat-plugin</artifactId>
-           <configuration>
-             <excludes>
-               <exclude>bin-LICENSE</exclude>
-               <exclude>bin-NOTICE</exclude>
-               <exclude>nbproject/**</exclude>
-               <exclude>nb-configuration.xml</exclude>
-               <exclude>nbactions.xml</exclude>
-             </excludes>
-           </configuration>
-         </plugin>
-       </plugins>
-     </pluginManagement>
      <plugins>
        <plugin>
 +        <groupId>org.apache.maven.plugins</groupId>
 +        <artifactId>maven-dependency-plugin</artifactId>
 +        <executions>
 +          <execution>
 +            <!-- generate version listing for packaged dependencies -->
 +            <id>generate-dependencies-raw</id>
 +            <goals>
 +              <goal>list</goal>
 +            </goals>
 +            <phase>compile</phase>
 +            <configuration>
 +              <outputFile>${project.build.directory}/dependencies.raw.txt</outputFile>
 +              <outputScope>false</outputScope>
 +              <sort>true</sort>
 +              <!-- this list should match that in src/main/assemblies/component.xml -->
 +              <includeArtifactIds>commons-math,commons-vfs2,gson,guava,htrace-core,javax.servlet-api,jcommander,jetty-http,jetty-io,jetty-security,jetty-server,jetty-servlet,jetty-util,jline,libthrift,protobuf-java,slf4j-api,slf4j-log4j12</includeArtifactIds>
 +              <excludeTransitive>true</excludeTransitive>
 +            </configuration>
 +          </execution>
 +        </executions>
 +      </plugin>
 +      <plugin>
          <groupId>org.codehaus.mojo</groupId>
          <artifactId>exec-maven-plugin</artifactId>
          <executions>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/assemble/src/main/assemblies/component.xml
----------------------------------------------------------------------
diff --cc assemble/src/main/assemblies/component.xml
index 22a5c22,b9ea051..84a3a06
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@@ -248,30 -244,18 +248,28 @@@
        <directory>../</directory>
        <fileMode>0644</fileMode>
        <includes>
 -        <include>README</include>
 +        <include>README.md</include>
 +        <include>INSTALL.md</include>
 +        <include>BUILD.md</include>
 +      </includes>
 +    </fileSet>
 +    <fileSet>
 +      <directory>target</directory>
 +      <outputDirectory>lib</outputDirectory>
 +      <fileMode>0644</fileMode>
 +      <includes>
 +        <include>VERSIONS</include>
        </includes>
      </fileSet>
-   </fileSets>
-   <files>
-     <file>
-       <source>bin-NOTICE</source>
-       <destName>NOTICE</destName>
-       <fileMode>0644</fileMode>
-     </file>
-     <file>
-       <source>bin-LICENSE</source>
-       <destName>LICENSE</destName>
+     <fileSet>
+       <directory>src/main/resources</directory>
+       <directoryMode>0755</directoryMode>
        <fileMode>0644</fileMode>
-     </file>
-   </files>
+       <outputDirectory>.</outputDirectory>
+       <includes>
+         <include>LICENSE</include>
+         <include>NOTICE</include>
+       </includes>
+     </fileSet>
+   </fileSets>
  </component>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/assemble/src/main/resources/LICENSE
----------------------------------------------------------------------
diff --cc assemble/src/main/resources/LICENSE
index 0000000,9cfab86..9ba98fd
mode 000000,100644..100644
--- a/assemble/src/main/resources/LICENSE
+++ b/assemble/src/main/resources/LICENSE
@@@ -1,0 -1,883 +1,921 @@@
+ 
+                                  Apache License
+                            Version 2.0, January 2004
+                         http://www.apache.org/licenses/
+ 
+    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ 
+    1. Definitions.
+ 
+       "License" shall mean the terms and conditions for use, reproduction,
+       and distribution as defined by Sections 1 through 9 of this document.
+ 
+       "Licensor" shall mean the copyright owner or entity authorized by
+       the copyright owner that is granting the License.
+ 
+       "Legal Entity" shall mean the union of the acting entity and all
+       other entities that control, are controlled by, or are under common
+       control with that entity. For the purposes of this definition,
+       "control" means (i) the power, direct or indirect, to cause the
+       direction or management of such entity, whether by contract or
+       otherwise, or (ii) ownership of fifty percent (50%) or more of the
+       outstanding shares, or (iii) beneficial ownership of such entity.
+ 
+       "You" (or "Your") shall mean an individual or Legal Entity
+       exercising permissions granted by this License.
+ 
+       "Source" form shall mean the preferred form for making modifications,
+       including but not limited to software source code, documentation
+       source, and configuration files.
+ 
+       "Object" form shall mean any form resulting from mechanical
+       transformation or translation of a Source form, including but
+       not limited to compiled object code, generated documentation,
+       and conversions to other media types.
+ 
+       "Work" shall mean the work of authorship, whether in Source or
+       Object form, made available under the License, as indicated by a
+       copyright notice that is included in or attached to the work
+       (an example is provided in the Appendix below).
+ 
+       "Derivative Works" shall mean any work, whether in Source or Object
+       form, that is based on (or derived from) the Work and for which the
+       editorial revisions, annotations, elaborations, or other modifications
+       represent, as a whole, an original work of authorship. For the purposes
+       of this License, Derivative Works shall not include works that remain
+       separable from, or merely link (or bind by name) to the interfaces of,
+       the Work and Derivative Works thereof.
+ 
+       "Contribution" shall mean any work of authorship, including
+       the original version of the Work and any modifications or additions
+       to that Work or Derivative Works thereof, that is intentionally
+       submitted to Licensor for inclusion in the Work by the copyright owner
+       or by an individual or Legal Entity authorized to submit on behalf of
+       the copyright owner. For the purposes of this definition, "submitted"
+       means any form of electronic, verbal, or written communication sent
+       to the Licensor or its representatives, including but not limited to
+       communication on electronic mailing lists, source code control systems,
+       and issue tracking systems that are managed by, or on behalf of, the
+       Licensor for the purpose of discussing and improving the Work, but
+       excluding communication that is conspicuously marked or otherwise
+       designated in writing by the copyright owner as "Not a Contribution."
+ 
+       "Contributor" shall mean Licensor and any individual or Legal Entity
+       on behalf of whom a Contribution has been received by Licensor and
+       subsequently incorporated within the Work.
+ 
+    2. Grant of Copyright License. Subject to the terms and conditions of
+       this License, each Contributor hereby grants to You a perpetual,
+       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+       copyright license to reproduce, prepare Derivative Works of,
+       publicly display, publicly perform, sublicense, and distribute the
+       Work and such Derivative Works in Source or Object form.
+ 
+    3. Grant of Patent License. Subject to the terms and conditions of
+       this License, each Contributor hereby grants to You a perpetual,
+       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+       (except as stated in this section) patent license to make, have made,
+       use, offer to sell, sell, import, and otherwise transfer the Work,
+       where such license applies only to those patent claims licensable
+       by such Contributor that are necessarily infringed by their
+       Contribution(s) alone or by combination of their Contribution(s)
+       with the Work to which such Contribution(s) was submitted. If You
+       institute patent litigation against any entity (including a
+       cross-claim or counterclaim in a lawsuit) alleging that the Work
+       or a Contribution incorporated within the Work constitutes direct
+       or contributory patent infringement, then any patent licenses
+       granted to You under this License for that Work shall terminate
+       as of the date such litigation is filed.
+ 
+    4. Redistribution. You may reproduce and distribute copies of the
+       Work or Derivative Works thereof in any medium, with or without
+       modifications, and in Source or Object form, provided that You
+       meet the following conditions:
+ 
+       (a) You must give any other recipients of the Work or
+           Derivative Works a copy of this License; and
+ 
+       (b) You must cause any modified files to carry prominent notices
+           stating that You changed the files; and
+ 
+       (c) You must retain, in the Source form of any Derivative Works
+           that You distribute, all copyright, patent, trademark, and
+           attribution notices from the Source form of the Work,
+           excluding those notices that do not pertain to any part of
+           the Derivative Works; and
+ 
+       (d) If the Work includes a "NOTICE" text file as part of its
+           distribution, then any Derivative Works that You distribute must
+           include a readable copy of the attribution notices contained
+           within such NOTICE file, excluding those notices that do not
+           pertain to any part of the Derivative Works, in at least one
+           of the following places: within a NOTICE text file distributed
+           as part of the Derivative Works; within the Source form or
+           documentation, if provided along with the Derivative Works; or,
+           within a display generated by the Derivative Works, if and
+           wherever such third-party notices normally appear. The contents
+           of the NOTICE file are for informational purposes only and
+           do not modify the License. You may add Your own attribution
+           notices within Derivative Works that You distribute, alongside
+           or as an addendum to the NOTICE text from the Work, provided
+           that such additional attribution notices cannot be construed
+           as modifying the License.
+ 
+       You may add Your own copyright statement to Your modifications and
+       may provide additional or different license terms and conditions
+       for use, reproduction, or distribution of Your modifications, or
+       for any such Derivative Works as a whole, provided Your use,
+       reproduction, and distribution of the Work otherwise complies with
+       the conditions stated in this License.
+ 
+    5. Submission of Contributions. Unless You explicitly state otherwise,
+       any Contribution intentionally submitted for inclusion in the Work
+       by You to the Licensor shall be under the terms and conditions of
+       this License, without any additional terms or conditions.
+       Notwithstanding the above, nothing herein shall supersede or modify
+       the terms of any separate license agreement you may have executed
+       with Licensor regarding such Contributions.
+ 
+    6. Trademarks. This License does not grant permission to use the trade
+       names, trademarks, service marks, or product names of the Licensor,
+       except as required for reasonable and customary use in describing the
+       origin of the Work and reproducing the content of the NOTICE file.
+ 
+    7. Disclaimer of Warranty. Unless required by applicable law or
+       agreed to in writing, Licensor provides the Work (and each
+       Contributor provides its Contributions) on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied, including, without limitation, any warranties or conditions
+       of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+       PARTICULAR PURPOSE. You are solely responsible for determining the
+       appropriateness of using or redistributing the Work and assume any
+       risks associated with Your exercise of permissions under this License.
+ 
+    8. Limitation of Liability. In no event and under no legal theory,
+       whether in tort (including negligence), contract, or otherwise,
+       unless required by applicable law (such as deliberate and grossly
+       negligent acts) or agreed to in writing, shall any Contributor be
+       liable to You for damages, including any direct, indirect, special,
+       incidental, or consequential damages of any character arising as a
+       result of this License or out of the use or inability to use the
+       Work (including but not limited to damages for loss of goodwill,
+       work stoppage, computer failure or malfunction, or any and all
+       other commercial damages or losses), even if such Contributor
+       has been advised of the possibility of such damages.
+ 
+    9. Accepting Warranty or Additional Liability. While redistributing
+       the Work or Derivative Works thereof, You may choose to offer,
+       and charge a fee for, acceptance of support, warranty, indemnity,
+       or other liability obligations and/or rights consistent with this
+       License. However, in accepting such obligations, You may act only
+       on Your own behalf and on Your sole responsibility, not on behalf
+       of any other Contributor, and only if You agree to indemnify,
+       defend, and hold each Contributor harmless for any liability
+       incurred by, or claims asserted against, such Contributor by reason
+       of your accepting any such warranty or additional liability.
+ 
+    END OF TERMS AND CONDITIONS
+ 
+    APPENDIX: How to apply the Apache License to your work.
+ 
+       To apply the Apache License to your work, attach the following
+       boilerplate notice, with the fields enclosed by brackets "[]"
+       replaced with your own identifying information. (Don't include
+       the brackets!)  The text should be enclosed in the appropriate
+       comment syntax for the file format. We also recommend that a
+       file or class name and description of purpose be included on the
+       same "printed page" as the copyright notice for easier
+       identification within third-party archives.
+ 
+    Copyright [yyyy] [name of copyright owner]
+ 
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+ 
+        http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+ 
+ **********
+ 
+ APACHE ACCUMULO SUBCOMPONENTS:
+ 
+ The Apache Accumulo project contains subcomponents with separate copyright
+ 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 includes software from the European Commission project OneLab:
+ 
+ * BloomFilter.java
+ * DynamicBloomFilter.java
+ * Filter.java
+ 
+     Copyright (c) 2005, European Commission project OneLab under contract 034819
+     (http://www.one-lab.org)
+ 
+     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 the University Catholique de Louvain - UCL
+        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.
+ 
+ **********
+ 
+ This product includes JQuery:
+ 
+     Copyright 2011, John Resig
+     Dual licensed under the MIT or GPL Version 2 licenses.
+     http://jquery.org/license
+ 
+     Includes Sizzle.js
+     http://sizzlejs.com/
+     Copyright 2011, The Dojo Foundation
+     Released under the MIT, BSD, and GPL Licenses.
+ 
+     Distributed under the MIT License:
+ 
+     Permission is hereby granted, free of charge, to any person
+     obtaining a copy of this software and associated documentation
+     files (the "Software"), to deal in the Software without
+     restriction, including without limitation the rights to use,
+     copy, modify, merge, publish, distribute, sublicense, and/or sell
+     copies of the Software, and to permit persons to whom the
+     Software is furnished to do so, subject to the following
+     conditions:
+ 
+     The above copyright notice and this permission notice shall be
+     included in all copies or substantial portions of the Software.
+ 
+     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+     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 includes Flot:
+ 
+     Copyright (c) 2007-2009 IOLA and Ole Laursen
+ 
+     Available under the MIT License (see above)
+ 
+     Flot bundles additional works:
+ 
+     jquery.pie.js
+     * Created by Brian Medendorp, June 2009
+     * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+ 
+     jquery.flot.resize.js
+     * Inline dependency:
+      * jQuery resize event - v1.1 - 3/14/2010
+      * http://benalman.com/projects/jquery-resize-plugin/
+      *
+      * Copyright (c) 2010 "Cowboy" Ben Alman
+      * Dual licensed under the MIT and GPL licenses.
+      * http://benalman.com/about/license/
+ 
+     distributed under the MIT license (see above)
+ 
+ **********
+ 
+ This product includes jline:
+ 
+     The BSD License
+ 
+     Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>
+     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 JLine 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.
+ 
+ **********
+ 
+ This product includes Apache Commons Math:
+ 
+     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
+     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
+     THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR
+     IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES
+     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE
+     OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY
+     OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR
+     USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF
+     THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4)
+     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,
+     INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF
+     ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF
+     PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER
+     SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT
+     (INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE,
+     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:
+ 
+ 
+     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.
+ 
+     - 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.
+     ===============================================================================
+ 
+     Copyright and license statement for the original Mersenne twister C
+     routines translated in MersenneTwister class in package
+     org.apache.commons.math.random:
+ 
+        Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+        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
+             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.
+ 
++**********
++
++This product includes Protocol Buffers:
++
++    Copyright 2014, Google Inc. 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 Google Inc. 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.
++
++    Code generated by the Protocol Buffer compiler is owned by the owner
++    of the input file used when generating it. This code is not
++    standalone and requires a support library to be linked with it. This
++    support library is itself covered by the above license.
+ 
+ **********
+ 
+ This product includes slf4j:
+ 
+     Copyright (c) 2004-2013 QOS.ch
+     All rights reserved.
+ 
+     Permission is hereby granted, free  of charge, to any person obtaining
+     a  copy  of this  software  and  associated  documentation files  (the
+     "Software"), to  deal in  the Software without  restriction, including
+     without limitation  the rights to  use, copy, modify,  merge, publish,
+     distribute,  sublicense, and/or sell  copies of  the Software,  and to
+     permit persons to whom the Software  is furnished to do so, subject to
+     the following conditions:
+ 
+     The  above  copyright  notice  and  this permission  notice  shall  be
+     included in all copies or substantial portions of the Software.
+ 
+     THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+     EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+     MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+     LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 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 includes javax.servlet-api (http://servlet-spec.java.net):
+ 
+   COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+ 
+   1. Definitions.
+ 
+      1.1. Contributor. means each individual or entity that creates or
+      contributes to the creation of Modifications.
+ 
+      1.2. Contributor Version. means the combination of the Original Software,
+      prior Modifications used by a Contributor (if any), and the Modifications
+      made by that particular Contributor.
+ 
+      1.3. Covered Software. means (a) the Original Software, or (b)
+      Modifications, or (c) the combination of files containing Original Software
+      with files containing Modifications, in each case including portions thereof.
+ 
+      1.4. Executable. means the Covered Software in any form other than Source
+      Code.
+ 
+      1.5. Initial Developer. means the individual or entity that first makes
+      Original Software available under this License.
+ 
+      1.6. Larger Work. means a work which combines Covered Software or portions
+      thereof with code not governed by the terms of this License.
+ 
+      1.7. License. means this document.
+ 
+      1.8. Licensable. means having the right to grant, to the maximum extent
+      possible, whether at the time of the initial grant or subsequently
+      acquired, any and all of the rights conveyed herein.
+ 
+      1.9. Modifications. means the Source Code and Executable form of any of the
+      following:
+ 
+           A. Any file that results from an addition to, deletion from or
+           modification of the contents of a file containing Original Software or
+           previous Modifications;
+ 
+           B. Any new file that contains any part of the Original Software or
+           previous Modification; or
+ 
+           C. Any new file that is contributed or otherwise made available under
+           the terms of this License.
+ 
+      1.10. Original Software. means the Source Code and Executable form of
+      computer software code that is originally released under this License.
+ 
+      1.11. Patent Claims. means any patent claim(s), now owned or hereafter
+      acquired, including without limitation, method, process, and apparatus
+      claims, in any patent Licensable by grantor.
+ 
+      1.12. Source Code. means (a) the common form of computer software code in
+      which modifications are made and (b) associated documentation included in
+      or with such code.
+ 
+      1.13. You. (or .Your.) means an individual or a legal entity exercising
+      rights under, and complying with all of the terms of, this License. For
+      legal entities, .You. includes any entity which controls, is controlled by,
+      or is under common control with You. For purposes of this definition,
+      .control. means (a) the power, direct or indirect, to cause the direction
+      or management of such entity, whether by contract or otherwise, or (b)
+      ownership of more than fifty percent (50%) of the outstanding shares or
+      beneficial ownership of such entity.
+ 
+   2. License Grants.
+ 
+         2.1. The Initial Developer Grant.
+ 
+         Conditioned upon Your compliance with Section 3.1 below and subject to
+         third party intellectual property claims, the Initial Developer hereby
+         grants You a world-wide, royalty-free, non-exclusive license:
+ 
+            (a) under intellectual property rights (other than patent or
+            trademark) Licensable by Initial Developer, to use, reproduce,
+            modify, display, perform, sublicense and distribute the Original
+            Software (or portions thereof), with or without Modifications, and/or
+            as part of a Larger Work; and
+ 
+            (b) under Patent Claims infringed by the making, using or selling of
+            Original Software, to make, have made, use, practice, sell, and offer
+            for sale, and/or otherwise dispose of the Original Software (or
+            portions thereof).
+ 
+           (c) The licenses granted in Sections 2.1(a) and (b) are effective on
+           the date Initial Developer first distributes or otherwise makes the
+           Original Software available to a third party under the terms of this
+           License.
+ 
+           (d) Notwithstanding Section 2.1(b) above, no patent license is
+           granted: (1) for code that You delete from the Original Software, or
+           (2) for infringements caused by: (i) the modification of the Original
+           Software, or (ii) the combination of the Original Software with other
+           software or devices.
+ 
+       2.2. Contributor Grant.
+ 
+       Conditioned upon Your compliance with Section 3.1 below and subject to
+       third party intellectual property claims, each Contributor hereby grants
+       You a world-wide, royalty-free, non-exclusive license:
+ 
+           (a) under intellectual property rights (other than patent or
+           trademark) Licensable by Contributor to use, reproduce, modify,
+           display, perform, sublicense and distribute the Modifications created
+           by such Contributor (or portions thereof), either on an unmodified
+           basis, with other Modifications, as Covered Software and/or as part of
+           a Larger Work; and
+ 
+           (b) under Patent Claims infringed by the making, using, or selling of
+           Modifications made by that Contributor either alone and/or in
+           combination with its Contributor Version (or portions of such
+           combination), to make, use, sell, offer for sale, have made,
+           and/or otherwise dispose of: (1) Modifications made by that
+           Contributor (or portions thereof); and (2) the combination of
+           Modifications made by that Contributor with its Contributor Version
+           (or portions of such combination).
+ 
+           (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
+           on the date Contributor first distributes or otherwise makes the
+           Modifications available to a third party.
+ 
+           (d) Notwithstanding Section 2.2(b) above, no patent license is
+           granted: (1) for any code that Contributor has deleted from the
+           Contributor Version; (2) for infringements caused by: (i) third party
+           modifications of Contributor Version, or (ii) the combination of
+           Modifications made by that Contributor with other software (except as
+           part of the Contributor Version) or other devices; or (3) under
+           Patent Claims infringed by Covered Software in the absence of
+           Modifications made by that Contributor.
+ 
+   3. Distribution Obligations.
+ 
+         3.1. Availability of Source Code.  Any Covered Software that You
+         distribute or otherwise make available in Executable form must also be
+         made available in Source Code form and that Source Code form must be
+         distributed only under the terms of this License. You must include a
+         copy of this License with every copy of the Source Code form of the
+         Covered Software You distribute or otherwise make available. You must
+         inform recipients of any such Covered Software in Executable form as to
+         how they can obtain such Covered Software in Source Code form in a
+         reasonable manner on or through a medium customarily used for software
+         exchange.
+ 
+         3.2. Modifications.  The Modifications that You create or to which You
+         contribute are governed by the terms of this License. You represent that
+         You believe Your Modifications are Your original creation(s) and/or You
+         have sufficient rights to grant the rights conveyed by this License.
+ 
+         3.3. Required Notices.  You must include a notice in each of Your
+         Modifications that identifies You as the Contributor of the
+         Modification. You may not remove or alter any copyright, patent or
+         trademark notices contained within the Covered Software, or any notices
+         of licensing or any descriptive text giving attribution to any
+         Contributor or the Initial Developer.
+ 
+         3.4. Application of Additional Terms.  You may not offer or impose any
+         terms on any Covered Software in Source Code form that alters or
+         restricts the applicable version of this License or the recipients.
+         rights hereunder.  You may choose to offer, and to charge a fee for,
+         warranty, support, indemnity or liability obligations to one or more
+         recipients of Covered Software. However, you may do so only on Your own
+         behalf, and not on behalf of the Initial Developer or any Contributor.
+         You must make it absolutely clear that any such warranty, support,
+         indemnity or liability obligation is offered by You alone, and You
+         hereby agree to indemnify the Initial Developer and every Contributor
+         for any liability incurred by the Initial Developer or such Contributor
+         as a result of warranty, support, indemnity or liability terms You
+         offer.
+ 
+         3.5. Distribution of Executable Versions.  You may distribute the
+         Executable form of the Covered Software under the terms of this License
+         or under the terms of a license of Your choice, which may contain terms
+         different from this License, provided that You are in compliance with
+         the terms of this License and that the license for the Executable form
+         does not attempt to limit or alter the recipient.s rights in the Source
+         Code form from the rights set forth in this License. If You distribute
+         the Covered Software in Executable form under a different license, You
+         must make it absolutely clear that any terms which differ from this
+         License are offered by You alone, not by the Initial Developer or
+         Contributor. You hereby agree to indemnify the Initial Developer and
+         every Contributor for any liability incurred by the Initial Developer or
+         such Contributor as a result of any such terms You offer.
+ 
+         3.6. Larger Works.  You may create a Larger Work by combining Covered
+         Software with other code not governed by the terms of this License and
+         distribute the Larger Work as a single product. In such a case, You must
+         make sure the requirements of this License are fulfilled for the Covered
+         Software.
+ 
+   4. Versions of the License.
+ 
+         4.1. New Versions.  Sun Microsystems, Inc. is the initial license
+         steward and may publish revised and/or new versions of this License from
+         time to time. Each version will be given a distinguishing version
+         number. Except as provided in Section 4.3, no one other than the license
+         steward has the right to modify this License.
+ 
+         4.2. Effect of New Versions.  You may always continue to use, distribute
+         or otherwise make the Covered Software available under the terms of the
+         version of the License under which You originally received the Covered
+         Software. If the Initial Developer includes a notice in the Original
+         Software prohibiting it from being distributed or otherwise made
+         available under any subsequent version of the License, You must
+         distribute and make the Covered Software available under the terms of
+         the version of the License under which You originally received the
+         Covered Software. Otherwise, You may also choose to use, distribute or
+         otherwise make the Covered Software available under the terms of any
+         subsequent version of the License published by the license steward.
+ 
+         4.3. Modified Versions.  When You are an Initial Developer and You want
+         to create a new license for Your Original Software, You may create and
+         use a modified version of this License if You: (a) rename the license
+         and remove any references to the name of the license steward (except to
+         note that the license differs from this License); and (b) otherwise
+         make it clear that the license contains terms which differ from this
+         License.
+ 
+   5. DISCLAIMER OF WARRANTY.
+ 
+      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS,
+      WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+      WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
+      DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE
+      ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS
+      WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU
+      (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
+      NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY
+      CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
+      SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+ 
+   6. TERMINATION.
+ 
+         6.1. This License and the rights granted hereunder will terminate
+         automatically if You fail to comply with terms herein and fail to cure
+         such breach within 30 days of becoming aware of the breach. Provisions
+         which, by their nature, must remain in effect beyond the termination of
+         this License shall survive.
+ 
+         6.2. If You assert a patent infringement claim (excluding declaratory
+         judgment actions) against Initial Developer or a Contributor (the
+         Initial Developer or Contributor against whom You assert such
+         claim is referred to as .Participant.) alleging that the
+         Participant Software (meaning the Contributor Version where the
+         Participant is a Contributor or the Original Software where the
+         Participant is the Initial Developer) directly or indirectly
+         infringes any patent, then any and all rights granted directly or
+         indirectly to You by such Participant, the Initial Developer (if the
+         Initial Developer is not the Participant) and all Contributors
+         under Sections 2.1 and/or 2.2 of this License shall, upon 60 days
+         notice from Participant terminate prospectively and automatically at
+         the expiration of such 60 day notice period, unless if within such
+         60 day period You withdraw Your claim with respect to the
+         Participant Software against such Participant either unilaterally or
+         pursuant to a written agreement with Participant.
+ 
+         6.3. In the event of termination under Sections 6.1 or 6.2 above, all
+         end user licenses that have been validly granted by You or any
+         distributor hereunder prior to termination (excluding licenses granted
+         to You by any distributor) shall survive termination.
+ 
+   7. LIMITATION OF LIABILITY.
+ 
+      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
+      NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER,
+      ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY
+      SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT,
+      SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING,
+      WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
+      STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL
+      DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
+      POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY
+      TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY.S
+      NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME
+      JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+      CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
+      YOU.
+ 
+   8. U.S. GOVERNMENT END USERS.
+ 
+      The Covered Software is a .commercial item,. as that term is defined in 48
+      C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as
+      that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and .commercial
+      computer software documentation. as such terms are used in 48 C.F.R. 12.212
+      (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+      through 227.7202-4 (June 1995), all U.S. Government End Users acquire
+      Covered Software with only those rights set forth herein. This U.S.
+      Government Rights clause is in lieu of, and supersedes, any other FAR,
+      DFAR, or other clause or provision that addresses Government rights in
+      computer software under this License.
+ 
+   9. MISCELLANEOUS.
+ 
+      This License represents the complete agreement concerning subject matter
+      hereof. If any provision of this License is held to be unenforceable, such
+      provision shall be reformed only to the extent necessary to make it
+      enforceable.  This License shall be governed by the law of the jurisdiction
+      specified in a notice contained within the Original Software (except to the
+      extent applicable law, if any, provides otherwise), excluding such
+      jurisdiction.s conflict-of-law provisions. Any litigation relating to this
+      License shall be subject to the jurisdiction of the courts located in the
+      jurisdiction and venue specified in a notice contained within the Original
+      Software, with the losing party responsible for costs, including, without
+      limitation, court costs and reasonable attorneys. fees and expenses. The
+      application of the United Nations Convention on Contracts for the
+      International Sale of Goods is expressly excluded. Any law or regulation
+      which provides that the language of a contract shall be construed against
+      the drafter shall not apply to this License. You agree that You alone are
+      responsible for compliance with the United States export administration
+      regulations (and the export control laws and regulation of any other countries)
+      when You use, distribute or otherwise make available any Covered Software.
+ 
+   10. RESPONSIBILITY FOR CLAIMS.
+ 
+      As between Initial Developer and the Contributors, each party is
+      responsible for claims and damages arising, directly or indirectly, out of
+      its utilization of rights under this License and You agree to work with
+      Initial Developer and Contributors to distribute such responsibility on an
+      equitable basis. Nothing herein is intended or shall be deemed to
+      constitute any admission of liability.
+ 
+      NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
+      LICENSE (CDDL)
+ 
+      The code released under the CDDL shall be governed by the laws of the State
+      of California (excluding conflict-of-law provisions). Any litigation
+      relating to this License shall be subject to the jurisdiction of the
+      Federal Courts of the Northern District of California and the state courts
+      of the State of California, with venue lying in Santa Clara County,
+      California.
+ 
+ **********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/core/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/examples/simple/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/server/base/pom.xml
----------------------------------------------------------------------
diff --cc server/base/pom.xml
index 6096017,7b11aa1..288b359
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@@ -127,59 -118,5 +127,30 @@@
          <directory>src/test/resources</directory>
        </testResource>
      </testResources>
-     <plugins>
-       <plugin>
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-resources-plugin</artifactId>
-         <executions>
-           <execution>
-             <id>license-javadocs</id>
-             <goals>
-               <goal>copy-resources</goal>
-             </goals>
-             <phase>prepare-package</phase>
-             <configuration>
-               <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
-               <resources>
-                 <resource>
-                   <directory>src/main/javadoc/META-INF/</directory>
-                   <targetPath>META-INF/</targetPath>
-                   <includes>
-                     <include>LICENSE</include>
-                     <include>NOTICE</include>
-                   </includes>
-                   <filtering>true</filtering>
-                 </resource>
-               </resources>
-             </configuration>
-           </execution>
-         </executions>
-       </plugin>
-     </plugins>
    </build>
 +  <profiles>
 +    <profile>
 +      <id>protobuf</id>
 +      <build>
 +        <plugins>
 +          <plugin>
 +            <groupId>org.codehaus.mojo</groupId>
 +            <artifactId>exec-maven-plugin</artifactId>
 +            <executions>
 +              <execution>
 +                <id>generate-protobuf</id>
 +                <goals>
 +                  <goal>exec</goal>
 +                </goals>
 +                <phase>generate-sources</phase>
 +                <configuration>
 +                  <executable>${basedir}/src/main/scripts/generate-protobuf.sh</executable>
 +                </configuration>
 +              </execution>
 +            </executions>
 +          </plugin>
 +        </plugins>
 +      </build>
 +    </profile>
 +  </profiles>
  </project>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/server/monitor/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/server/tserver/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/shell/pom.xml
----------------------------------------------------------------------
diff --cc shell/pom.xml
index 85bc740,0000000..a102d1e
mode 100644,000000..100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@@ -1,145 -1,0 +1,128 @@@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!--
 +  Licensed to the Apache Software Foundation (ASF) under one or more
 +  contributor license agreements.  See the NOTICE file distributed with
 +  this work for additional information regarding copyright ownership.
 +  The ASF licenses this file to You under the Apache License, Version 2.0
 +  (the "License"); you may not use this file except in compliance with
 +  the License.  You may obtain a copy of the License at
 +
 +      http://www.apache.org/licenses/LICENSE-2.0
 +
 +  Unless required by applicable law or agreed to in writing, software
 +  distributed under the License is distributed on an "AS IS" BASIS,
 +  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 +  See the License for the specific language governing permissions and
 +  limitations under the License.
 +-->
 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 +  <modelVersion>4.0.0</modelVersion>
 +  <parent>
 +    <groupId>org.apache.accumulo</groupId>
 +    <artifactId>accumulo-project</artifactId>
 +    <version>1.7.3-SNAPSHOT</version>
 +  </parent>
 +  <artifactId>accumulo-shell</artifactId>
 +  <name>Apache Accumulo Shell</name>
 +  <description>An interactive shell for accessing Apache Accumulo via a command line interface.</description>
 +  <dependencies>
 +    <dependency>
 +      <groupId>com.beust</groupId>
 +      <artifactId>jcommander</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>com.google.auto.service</groupId>
 +      <artifactId>auto-service</artifactId>
 +      <optional>true</optional>
 +    </dependency>
 +    <dependency>
 +      <groupId>com.google.guava</groupId>
 +      <artifactId>guava</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-cli</groupId>
 +      <artifactId>commons-cli</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-codec</groupId>
 +      <artifactId>commons-codec</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-collections</groupId>
 +      <artifactId>commons-collections</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-configuration</groupId>
 +      <artifactId>commons-configuration</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-io</groupId>
 +      <artifactId>commons-io</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-lang</groupId>
 +      <artifactId>commons-lang</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>jline</groupId>
 +      <artifactId>jline</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>log4j</groupId>
 +      <artifactId>log4j</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.accumulo</groupId>
 +      <artifactId>accumulo-core</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.accumulo</groupId>
 +      <artifactId>accumulo-fate</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.accumulo</groupId>
 +      <artifactId>accumulo-start</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.accumulo</groupId>
 +      <artifactId>accumulo-tracer</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.commons</groupId>
 +      <artifactId>commons-vfs2</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.hadoop</groupId>
 +      <artifactId>hadoop-client</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.thrift</groupId>
 +      <artifactId>libthrift</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>junit</groupId>
 +      <artifactId>junit</artifactId>
 +      <scope>test</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.easymock</groupId>
 +      <artifactId>easymock</artifactId>
 +      <scope>test</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.powermock</groupId>
 +      <artifactId>powermock-api-easymock</artifactId>
 +      <scope>test</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.powermock</groupId>
 +      <artifactId>powermock-core</artifactId>
 +      <scope>test</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.powermock</groupId>
 +      <artifactId>powermock-module-junit4</artifactId>
 +      <scope>test</scope>
 +    </dependency>
 +  </dependencies>
-   <build>
-     <pluginManagement>
-       <plugins>
-         <plugin>
-           <groupId>org.apache.rat</groupId>
-           <artifactId>apache-rat-plugin</artifactId>
-           <configuration>
-             <excludes>
-               <exclude>nbproject/**</exclude>
-               <exclude>nb-configuration.xml</exclude>
-               <exclude>nbactions.xml</exclude>
-             </excludes>
-           </configuration>
-         </plugin>
-       </plugins>
-     </pluginManagement>
-   </build>
 +</project>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/test/pom.xml
----------------------------------------------------------------------
diff --cc test/pom.xml
index 032b97d,e3cba7e..4c73f89
--- a/test/pom.xml
+++ b/test/pom.xml
@@@ -201,12 -181,8 +201,9 @@@
            <artifactId>apache-rat-plugin</artifactId>
            <configuration>
              <excludes>
 +              <exclude>compat/japi-compliance/exclude_classes.txt</exclude>
                <exclude>system/bench/lib/*splits</exclude>
                <exclude>system/continuous/*.txt</exclude>
-               <exclude>nbproject/**</exclude>
-               <exclude>nb-configuration.xml</exclude>
-               <exclude>nbactions.xml</exclude>
              </excludes>
            </configuration>
          </plugin>


[03/18] accumulo git commit: ACCUMULO-4382 Clean up license/notice files

Posted by ct...@apache.org.
ACCUMULO-4382 Clean up license/notice files

Remove unnecessary contents.
Converge on a consistent formatting.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dbdba2f9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dbdba2f9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dbdba2f9

Branch: refs/heads/1.7
Commit: dbdba2f9319e8fabc4279bb052e0c9db4b0852aa
Parents: a8d1acd
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Jul 21 17:00:26 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jul 21 18:12:48 2016 -0400

----------------------------------------------------------------------
 LICENSE                                         | 108 +++---
 NOTICE                                          |   7 -
 assemble/bin-LICENSE                            | 335 +++++++++----------
 assemble/bin-NOTICE                             |  14 +-
 .../main/appended-resources/META-INF/LICENSE    |  71 ++--
 server/base/pom.xml                             |  29 --
 .../src/main/appended-resources/META-INF/NOTICE |   9 -
 server/base/src/main/javadoc/META-INF/LICENSE   | 202 -----------
 server/base/src/main/javadoc/META-INF/NOTICE    |   5 -
 .../main/appended-resources/META-INF/LICENSE    | 100 +++---
 server/monitor/src/main/javadoc/META-INF/NOTICE |   5 -
 server/native/src/main/resources/LICENSE        |   1 -
 server/native/src/main/resources/NOTICE         |   2 +-
 server/tserver/pom.xml                          |  29 --
 14 files changed, 321 insertions(+), 596 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 7082472..4cfbbec 100644
--- a/LICENSE
+++ b/LICENSE
@@ -201,20 +201,25 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+**********
 
 APACHE ACCUMULO SUBCOMPONENTS:
 
 The Apache Accumulo project contains subcomponents with separate copyright
 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.
+subcomponents is subject to the terms and conditions of the following licenses.
 
-This product bundles softare from the European Commission project OneLab
-under contract 034819 (http://www.one-lab.org), which is available under
-a "3-clause BSD" license. For details, see
-  core/src/main/java/org/apache/accumulo/core/bloomfilter/
+**********
+
+This product includes software from the European Commission project OneLab:
+
+* BloomFilter.java
+* DynamicBloomFilter.java
+* Filter.java
+
+    Copyright (c) 2005, European Commission project OneLab under contract 034819
+    (http://www.one-lab.org)
 
-    Copyright (c) 2005, European Commission project OneLab under contract 034819 (http://www.one-lab.org)
     All rights reserved.
     Redistribution and use in source and binary forms, with or
     without modification, are permitted provided that the following
@@ -242,56 +247,65 @@ a "3-clause BSD" license. For details, see
     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     POSSIBILITY OF SUCH DAMAGE.
 
-----
+**********
+
+This product includes JQuery:
+
+    Copyright 2011, John Resig
+    Dual licensed under the MIT or GPL Version 2 licenses.
+    http://jquery.org/license
+
+    Includes Sizzle.js
+    http://sizzlejs.com/
+    Copyright 2011, The Dojo Foundation
+    Released under the MIT, BSD, and GPL Licenses.
 
-This product bundles JQuery and Flot, which are each available under
-The MIT License (MIT). For details, see
-  server/monitor/src/main/resources/web/flot/
+    Distributed under the MIT License:
 
-Text of the MIT License:
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use,
+    copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following
+    conditions:
 
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    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.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-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,
+This product includes Flot:
 
-Copyright (c) 2007-2009 IOLA and Ole Laursen
+    Copyright (c) 2007-2009 IOLA and Ole Laursen
 
-Available under the MIT License (see above)
+    Available under the MIT License (see above)
 
-Flot bundles additional works:
+    Flot bundles additional works:
 
-jquery.pie.js
-* Created by Brian Medendorp, June 2009
-* Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+    jquery.pie.js
+    * Created by Brian Medendorp, June 2009
+    * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
 
-jquery.flot.resize.js
-* Inline dependency:
- * jQuery resize event - v1.1 - 3/14/2010
- * http://benalman.com/projects/jquery-resize-plugin/
- *
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
+    jquery.flot.resize.js
+    * Inline dependency:
+     * jQuery resize event - v1.1 - 3/14/2010
+     * http://benalman.com/projects/jquery-resize-plugin/
+     *
+     * Copyright (c) 2010 "Cowboy" Ben Alman
+     * Dual licensed under the MIT and GPL licenses.
+     * http://benalman.com/about/license/
 
-distributed under the MIT license (see above)
+    distributed under the MIT license (see above)
 
-----
+**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index b2d441a..3a3fc27 100644
--- a/NOTICE
+++ b/NOTICE
@@ -3,10 +3,3 @@ Copyright 2011-2016 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
-
-This product includes the following work from the Apache Thrift project:
-
-TNonblockingServerSocket.java
-
-Apache Thrift
-Copyright 2006-2010 The Apache Software Foundation.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/assemble/bin-LICENSE
----------------------------------------------------------------------
diff --git a/assemble/bin-LICENSE b/assemble/bin-LICENSE
index 2f5fd9f..9cfab86 100644
--- a/assemble/bin-LICENSE
+++ b/assemble/bin-LICENSE
@@ -201,117 +201,116 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+**********
 
 APACHE ACCUMULO SUBCOMPONENTS:
 
 The Apache Accumulo project contains subcomponents with separate copyright
 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.
+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),
+**********
+
+This product includes software from the European Commission project OneLab:
 
 * BloomFilter.java
 * DynamicBloomFilter.java
 * 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
- * 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 the University Catholique de Louvain - UCL
- *    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.
-
-----
-
-This product bundles JQuery
-
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
-
-Distributed under the MIT License:
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-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/
-
-Copyright (c) 2007-2009 IOLA and Ole Laursen
-
-Available under the MIT License (see above)
-
-Flot bundles additional works:
-
-jquery.pie.js
-* Created by Brian Medendorp, June 2009
-* Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
-
-jquery.flot.resize.js
-* Inline dependency:
- * jQuery resize event - v1.1 - 3/14/2010
- * http://benalman.com/projects/jquery-resize-plugin/
- *
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
-
-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:
+    Copyright (c) 2005, European Commission project OneLab under contract 034819
+    (http://www.one-lab.org)
+
+    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 the University Catholique de Louvain - UCL
+       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.
+
+**********
+
+This product includes JQuery:
+
+    Copyright 2011, John Resig
+    Dual licensed under the MIT or GPL Version 2 licenses.
+    http://jquery.org/license
+
+    Includes Sizzle.js
+    http://sizzlejs.com/
+    Copyright 2011, The Dojo Foundation
+    Released under the MIT, BSD, and GPL Licenses.
+
+    Distributed under the MIT License:
+
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use,
+    copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following
+    conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    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 includes Flot:
+
+    Copyright (c) 2007-2009 IOLA and Ole Laursen
+
+    Available under the MIT License (see above)
+
+    Flot bundles additional works:
+
+    jquery.pie.js
+    * Created by Brian Medendorp, June 2009
+    * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+
+    jquery.flot.resize.js
+    * Inline dependency:
+     * jQuery resize event - v1.1 - 3/14/2010
+     * http://benalman.com/projects/jquery-resize-plugin/
+     *
+     * Copyright (c) 2010 "Cowboy" Ben Alman
+     * Dual licensed under the MIT and GPL licenses.
+     * http://benalman.com/about/license/
+
+    distributed under the MIT license (see above)
+
+**********
+
+This product includes jline:
 
     The BSD License
 
@@ -348,47 +347,48 @@ 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 includes Apache Commons Math:
 
     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.math.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 +402,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 +414,101 @@ 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:
-    
-    
+
+
     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 
+
+    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 
+
+    - 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 
+
+    - 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 
+
+    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  
+    "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 
+    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  
+    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. 
+    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 
+    routines translated in MersenneTwister class in package
     org.apache.commons.math.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 +521,10 @@ 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.
 
----------
 
-This distribution of this product bundles slf4j, which is available
-under the following MIT license:
+**********
+
+This product includes slf4j:
 
     Copyright (c) 2004-2013 QOS.ch
     All rights reserved.
@@ -548,10 +548,9 @@ 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).
+This product includes javax.servlet-api (http://servlet-spec.java.net):
 
   COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
 
@@ -881,4 +880,4 @@ available under the CDDL 1.0 license (http://servlet-spec.java.net).
      of the State of California, with venue lying in Santa Clara County,
      California.
 
-------
+**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/assemble/bin-NOTICE
----------------------------------------------------------------------
diff --git a/assemble/bin-NOTICE b/assemble/bin-NOTICE
index 07d574b..f6370f2 100644
--- a/assemble/bin-NOTICE
+++ b/assemble/bin-NOTICE
@@ -4,18 +4,18 @@ Copyright 2011-2016 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
+**********
+
 This product includes JCommander (https://github.com/cbeust/jcommander),
 Copyright 2010 Cedric Beust cedric@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/).
+This product includes Apache Commons Math (https://commons.apache.org/proper/commons-math/).
 Copyright 2001-2010 The Apache Software Foundation
 
+From commons-math NOTICE.txt:
+
     ===============================================================================
     The LinearConstraint, LinearObjectiveFunction, LinearOptimizer,
     RelationShip, SimplexSolver and SimplexTableau classes in package
@@ -55,5 +55,7 @@ Copyright 2001-2010 The Apache Software Foundation
     All rights reserved
     ===============================================================================
 
+**********
+
 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/dbdba2f9/core/src/main/appended-resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/core/src/main/appended-resources/META-INF/LICENSE b/core/src/main/appended-resources/META-INF/LICENSE
index af566f0..f3478ea 100644
--- a/core/src/main/appended-resources/META-INF/LICENSE
+++ b/core/src/main/appended-resources/META-INF/LICENSE
@@ -1,46 +1,47 @@
-----
+**********
 
 APACHE ACCUMULO SUBCOMPONENTS:
 
 The Apache Accumulo project contains subcomponents with separate copyright
 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.
+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),
+**********
+
+This product includes software from the European Commission project OneLab:
 
 * BloomFilter.java
 * DynamicBloomFilter.java
 * 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
- * 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 the University Catholique de Louvain - UCL
- *    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.
-
+    Copyright (c) 2005, European Commission project OneLab under contract 034819
+    (http://www.one-lab.org)
+
+    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 the University Catholique de Louvain - UCL
+       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.
+
+**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/base/pom.xml
----------------------------------------------------------------------
diff --git a/server/base/pom.xml b/server/base/pom.xml
index ea33018..7b11aa1 100644
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@ -118,34 +118,5 @@
         <directory>src/test/resources</directory>
       </testResource>
     </testResources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>license-javadocs</id>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>src/main/javadoc/META-INF/</directory>
-                  <targetPath>META-INF/</targetPath>
-                  <includes>
-                    <include>LICENSE</include>
-                    <include>NOTICE</include>
-                  </includes>
-                  <filtering>true</filtering>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
   </build>
 </project>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/base/src/main/appended-resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/server/base/src/main/appended-resources/META-INF/NOTICE b/server/base/src/main/appended-resources/META-INF/NOTICE
deleted file mode 100644
index a4f1f1a..0000000
--- a/server/base/src/main/appended-resources/META-INF/NOTICE
+++ /dev/null
@@ -1,9 +0,0 @@
-----
-
-This product includes the following work from the Apache Thrift project:
-
-TNonblockingServerSocket.java
-
-Apache Thrift
-Copyright 2006-2010 The Apache Software Foundation.
-

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/base/src/main/javadoc/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/server/base/src/main/javadoc/META-INF/LICENSE b/server/base/src/main/javadoc/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/server/base/src/main/javadoc/META-INF/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/base/src/main/javadoc/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/server/base/src/main/javadoc/META-INF/NOTICE b/server/base/src/main/javadoc/META-INF/NOTICE
deleted file mode 100644
index 3a3fc27..0000000
--- a/server/base/src/main/javadoc/META-INF/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Accumulo
-Copyright 2011-2016 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/monitor/src/main/appended-resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/appended-resources/META-INF/LICENSE b/server/monitor/src/main/appended-resources/META-INF/LICENSE
index 974cb4b..ae202cb 100644
--- a/server/monitor/src/main/appended-resources/META-INF/LICENSE
+++ b/server/monitor/src/main/appended-resources/META-INF/LICENSE
@@ -1,74 +1,70 @@
-----
+**********
 
 APACHE ACCUMULO SUBCOMPONENTS:
 
 The Apache Accumulo project contains subcomponents with separate copyright
 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.
+subcomponents is subject to the terms and conditions of the following licenses.
 
-----
+**********
 
-This product bundles JQuery
+This product includes JQuery:
 
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
+    Copyright 2011, John Resig
+    Dual licensed under the MIT or GPL Version 2 licenses.
+    http://jquery.org/license
 
-Distributed under the MIT License:
+    Includes Sizzle.js
+    http://sizzlejs.com/
+    Copyright 2011, The Dojo Foundation
+    Released under the MIT, BSD, and GPL Licenses.
 
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
+    Distributed under the MIT License:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use,
+    copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following
+    conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-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.
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
 
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    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,
+**********
 
-Copyright (c) 2007-2009 IOLA and Ole Laursen
+This product includes Flot:
 
-Available under the MIT License (see above)
+    Copyright (c) 2007-2009 IOLA and Ole Laursen
 
-Flot bundles additional works:
+    Available under the MIT License (see above)
 
-jquery.pie.js
-* Created by Brian Medendorp, June 2009
-* Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+    Flot bundles additional works:
 
-jquery.flot.resize.js
-* Inline dependency:
- * jQuery resize event - v1.1 - 3/14/2010
- * http://benalman.com/projects/jquery-resize-plugin/
- *
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
+    jquery.pie.js
+    * Created by Brian Medendorp, June 2009
+    * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
 
-distributed under the MIT license (see above)
+    jquery.flot.resize.js
+    * Inline dependency:
+     * jQuery resize event - v1.1 - 3/14/2010
+     * http://benalman.com/projects/jquery-resize-plugin/
+     *
+     * Copyright (c) 2010 "Cowboy" Ben Alman
+     * Dual licensed under the MIT and GPL licenses.
+     * http://benalman.com/about/license/
 
-For details, see
-  server/src/main/resources/web/flot/
+    distributed under the MIT license (see above)
 
-----
+**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/monitor/src/main/javadoc/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/javadoc/META-INF/NOTICE b/server/monitor/src/main/javadoc/META-INF/NOTICE
deleted file mode 100644
index 3a3fc27..0000000
--- a/server/monitor/src/main/javadoc/META-INF/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Accumulo
-Copyright 2011-2016 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/native/src/main/resources/LICENSE
----------------------------------------------------------------------
diff --git a/server/native/src/main/resources/LICENSE b/server/native/src/main/resources/LICENSE
index 6b0b127..d645695 100644
--- a/server/native/src/main/resources/LICENSE
+++ b/server/native/src/main/resources/LICENSE
@@ -200,4 +200,3 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/native/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/server/native/src/main/resources/NOTICE b/server/native/src/main/resources/NOTICE
index 3a3fc27..2316e0f 100644
--- a/server/native/src/main/resources/NOTICE
+++ b/server/native/src/main/resources/NOTICE
@@ -1,4 +1,4 @@
-Apache Accumulo
+Apache Accumulo Native Libraries
 Copyright 2011-2016 The Apache Software Foundation
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/tserver/pom.xml
----------------------------------------------------------------------
diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml
index 5ac1b46..fc1c9fb 100644
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@ -125,34 +125,5 @@
         </plugin>
       </plugins>
     </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>license-javadocs</id>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>src/main/javadoc/META-INF/</directory>
-                  <targetPath>META-INF/</targetPath>
-                  <includes>
-                    <include>LICENSE</include>
-                    <include>NOTICE</include>
-                  </includes>
-                  <filtering>true</filtering>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
   </build>
 </project>


[16/18] accumulo git commit: Merge branch '1.7' into 1.8

Posted by ct...@apache.org.
Merge branch '1.7' into 1.8


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/394ad086
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/394ad086
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/394ad086

Branch: refs/heads/1.8
Commit: 394ad0864ca931a2feea34677084b8c8332c73db
Parents: 7a47b18 f6465ac
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Jul 21 18:43:29 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jul 21 18:43:29 2016 -0400

----------------------------------------------------------------------
 LICENSE                                         | 109 +-
 NOTICE                                          |   7 -
 assemble/bin-LICENSE                            | 989 -------------------
 assemble/bin-NOTICE                             |  18 -
 assemble/pom.xml                                |  17 -
 assemble/src/main/assemblies/component.xml      |  22 +-
 assemble/src/main/resources/LICENSE             | 982 ++++++++++++++++++
 assemble/src/main/resources/NOTICE              |  23 +
 core/pom.xml                                    |  13 +-
 .../main/appended-resources/META-INF/LICENSE    |  71 +-
 examples/simple/pom.xml                         |  12 -
 pom.xml                                         |   3 +-
 server/base/pom.xml                             |  29 -
 .../src/main/appended-resources/META-INF/NOTICE |   9 -
 server/base/src/main/javadoc/META-INF/LICENSE   | 202 ----
 server/base/src/main/javadoc/META-INF/NOTICE    |   5 -
 server/monitor/pom.xml                          |   3 -
 .../main/appended-resources/META-INF/LICENSE    | 100 +-
 server/monitor/src/main/javadoc/META-INF/NOTICE |   5 -
 server/native/src/main/resources/LICENSE        |   1 -
 server/native/src/main/resources/NOTICE         |   2 +-
 server/tserver/pom.xml                          |  32 -
 shell/pom.xml                                   |  17 -
 test/pom.xml                                    |   3 -
 24 files changed, 1165 insertions(+), 1509 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/394ad086/assemble/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/394ad086/assemble/src/main/assemblies/component.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/394ad086/assemble/src/main/resources/LICENSE
----------------------------------------------------------------------
diff --cc assemble/src/main/resources/LICENSE
index 0000000,9ba98fd..7b7568a
mode 000000,100644..100644
--- a/assemble/src/main/resources/LICENSE
+++ b/assemble/src/main/resources/LICENSE
@@@ -1,0 -1,921 +1,982 @@@
+ 
+                                  Apache License
+                            Version 2.0, January 2004
+                         http://www.apache.org/licenses/
+ 
+    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ 
+    1. Definitions.
+ 
+       "License" shall mean the terms and conditions for use, reproduction,
+       and distribution as defined by Sections 1 through 9 of this document.
+ 
+       "Licensor" shall mean the copyright owner or entity authorized by
+       the copyright owner that is granting the License.
+ 
+       "Legal Entity" shall mean the union of the acting entity and all
+       other entities that control, are controlled by, or are under common
+       control with that entity. For the purposes of this definition,
+       "control" means (i) the power, direct or indirect, to cause the
+       direction or management of such entity, whether by contract or
+       otherwise, or (ii) ownership of fifty percent (50%) or more of the
+       outstanding shares, or (iii) beneficial ownership of such entity.
+ 
+       "You" (or "Your") shall mean an individual or Legal Entity
+       exercising permissions granted by this License.
+ 
+       "Source" form shall mean the preferred form for making modifications,
+       including but not limited to software source code, documentation
+       source, and configuration files.
+ 
+       "Object" form shall mean any form resulting from mechanical
+       transformation or translation of a Source form, including but
+       not limited to compiled object code, generated documentation,
+       and conversions to other media types.
+ 
+       "Work" shall mean the work of authorship, whether in Source or
+       Object form, made available under the License, as indicated by a
+       copyright notice that is included in or attached to the work
+       (an example is provided in the Appendix below).
+ 
+       "Derivative Works" shall mean any work, whether in Source or Object
+       form, that is based on (or derived from) the Work and for which the
+       editorial revisions, annotations, elaborations, or other modifications
+       represent, as a whole, an original work of authorship. For the purposes
+       of this License, Derivative Works shall not include works that remain
+       separable from, or merely link (or bind by name) to the interfaces of,
+       the Work and Derivative Works thereof.
+ 
+       "Contribution" shall mean any work of authorship, including
+       the original version of the Work and any modifications or additions
+       to that Work or Derivative Works thereof, that is intentionally
+       submitted to Licensor for inclusion in the Work by the copyright owner
+       or by an individual or Legal Entity authorized to submit on behalf of
+       the copyright owner. For the purposes of this definition, "submitted"
+       means any form of electronic, verbal, or written communication sent
+       to the Licensor or its representatives, including but not limited to
+       communication on electronic mailing lists, source code control systems,
+       and issue tracking systems that are managed by, or on behalf of, the
+       Licensor for the purpose of discussing and improving the Work, but
+       excluding communication that is conspicuously marked or otherwise
+       designated in writing by the copyright owner as "Not a Contribution."
+ 
+       "Contributor" shall mean Licensor and any individual or Legal Entity
+       on behalf of whom a Contribution has been received by Licensor and
+       subsequently incorporated within the Work.
+ 
+    2. Grant of Copyright License. Subject to the terms and conditions of
+       this License, each Contributor hereby grants to You a perpetual,
+       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+       copyright license to reproduce, prepare Derivative Works of,
+       publicly display, publicly perform, sublicense, and distribute the
+       Work and such Derivative Works in Source or Object form.
+ 
+    3. Grant of Patent License. Subject to the terms and conditions of
+       this License, each Contributor hereby grants to You a perpetual,
+       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+       (except as stated in this section) patent license to make, have made,
+       use, offer to sell, sell, import, and otherwise transfer the Work,
+       where such license applies only to those patent claims licensable
+       by such Contributor that are necessarily infringed by their
+       Contribution(s) alone or by combination of their Contribution(s)
+       with the Work to which such Contribution(s) was submitted. If You
+       institute patent litigation against any entity (including a
+       cross-claim or counterclaim in a lawsuit) alleging that the Work
+       or a Contribution incorporated within the Work constitutes direct
+       or contributory patent infringement, then any patent licenses
+       granted to You under this License for that Work shall terminate
+       as of the date such litigation is filed.
+ 
+    4. Redistribution. You may reproduce and distribute copies of the
+       Work or Derivative Works thereof in any medium, with or without
+       modifications, and in Source or Object form, provided that You
+       meet the following conditions:
+ 
+       (a) You must give any other recipients of the Work or
+           Derivative Works a copy of this License; and
+ 
+       (b) You must cause any modified files to carry prominent notices
+           stating that You changed the files; and
+ 
+       (c) You must retain, in the Source form of any Derivative Works
+           that You distribute, all copyright, patent, trademark, and
+           attribution notices from the Source form of the Work,
+           excluding those notices that do not pertain to any part of
+           the Derivative Works; and
+ 
+       (d) If the Work includes a "NOTICE" text file as part of its
+           distribution, then any Derivative Works that You distribute must
+           include a readable copy of the attribution notices contained
+           within such NOTICE file, excluding those notices that do not
+           pertain to any part of the Derivative Works, in at least one
+           of the following places: within a NOTICE text file distributed
+           as part of the Derivative Works; within the Source form or
+           documentation, if provided along with the Derivative Works; or,
+           within a display generated by the Derivative Works, if and
+           wherever such third-party notices normally appear. The contents
+           of the NOTICE file are for informational purposes only and
+           do not modify the License. You may add Your own attribution
+           notices within Derivative Works that You distribute, alongside
+           or as an addendum to the NOTICE text from the Work, provided
+           that such additional attribution notices cannot be construed
+           as modifying the License.
+ 
+       You may add Your own copyright statement to Your modifications and
+       may provide additional or different license terms and conditions
+       for use, reproduction, or distribution of Your modifications, or
+       for any such Derivative Works as a whole, provided Your use,
+       reproduction, and distribution of the Work otherwise complies with
+       the conditions stated in this License.
+ 
+    5. Submission of Contributions. Unless You explicitly state otherwise,
+       any Contribution intentionally submitted for inclusion in the Work
+       by You to the Licensor shall be under the terms and conditions of
+       this License, without any additional terms or conditions.
+       Notwithstanding the above, nothing herein shall supersede or modify
+       the terms of any separate license agreement you may have executed
+       with Licensor regarding such Contributions.
+ 
+    6. Trademarks. This License does not grant permission to use the trade
+       names, trademarks, service marks, or product names of the Licensor,
+       except as required for reasonable and customary use in describing the
+       origin of the Work and reproducing the content of the NOTICE file.
+ 
+    7. Disclaimer of Warranty. Unless required by applicable law or
+       agreed to in writing, Licensor provides the Work (and each
+       Contributor provides its Contributions) on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied, including, without limitation, any warranties or conditions
+       of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+       PARTICULAR PURPOSE. You are solely responsible for determining the
+       appropriateness of using or redistributing the Work and assume any
+       risks associated with Your exercise of permissions under this License.
+ 
+    8. Limitation of Liability. In no event and under no legal theory,
+       whether in tort (including negligence), contract, or otherwise,
+       unless required by applicable law (such as deliberate and grossly
+       negligent acts) or agreed to in writing, shall any Contributor be
+       liable to You for damages, including any direct, indirect, special,
+       incidental, or consequential damages of any character arising as a
+       result of this License or out of the use or inability to use the
+       Work (including but not limited to damages for loss of goodwill,
+       work stoppage, computer failure or malfunction, or any and all
+       other commercial damages or losses), even if such Contributor
+       has been advised of the possibility of such damages.
+ 
+    9. Accepting Warranty or Additional Liability. While redistributing
+       the Work or Derivative Works thereof, You may choose to offer,
+       and charge a fee for, acceptance of support, warranty, indemnity,
+       or other liability obligations and/or rights consistent with this
+       License. However, in accepting such obligations, You may act only
+       on Your own behalf and on Your sole responsibility, not on behalf
+       of any other Contributor, and only if You agree to indemnify,
+       defend, and hold each Contributor harmless for any liability
+       incurred by, or claims asserted against, such Contributor by reason
+       of your accepting any such warranty or additional liability.
+ 
+    END OF TERMS AND CONDITIONS
+ 
+    APPENDIX: How to apply the Apache License to your work.
+ 
+       To apply the Apache License to your work, attach the following
+       boilerplate notice, with the fields enclosed by brackets "[]"
+       replaced with your own identifying information. (Don't include
+       the brackets!)  The text should be enclosed in the appropriate
+       comment syntax for the file format. We also recommend that a
+       file or class name and description of purpose be included on the
+       same "printed page" as the copyright notice for easier
+       identification within third-party archives.
+ 
+    Copyright [yyyy] [name of copyright owner]
+ 
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+ 
+        http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+ 
+ **********
+ 
+ APACHE ACCUMULO SUBCOMPONENTS:
+ 
+ The Apache Accumulo project contains subcomponents with separate copyright
+ 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 includes software from the European Commission project OneLab:
+ 
+ * BloomFilter.java
+ * DynamicBloomFilter.java
+ * Filter.java
+ 
+     Copyright (c) 2005, European Commission project OneLab under contract 034819
+     (http://www.one-lab.org)
+ 
+     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 the University Catholique de Louvain - UCL
+        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.
+ 
+ **********
+ 
+ This product includes JQuery:
+ 
+     Copyright 2011, John Resig
+     Dual licensed under the MIT or GPL Version 2 licenses.
+     http://jquery.org/license
+ 
+     Includes Sizzle.js
+     http://sizzlejs.com/
+     Copyright 2011, The Dojo Foundation
+     Released under the MIT, BSD, and GPL Licenses.
+ 
+     Distributed under the MIT License:
+ 
+     Permission is hereby granted, free of charge, to any person
+     obtaining a copy of this software and associated documentation
+     files (the "Software"), to deal in the Software without
+     restriction, including without limitation the rights to use,
+     copy, modify, merge, publish, distribute, sublicense, and/or sell
+     copies of the Software, and to permit persons to whom the
+     Software is furnished to do so, subject to the following
+     conditions:
+ 
+     The above copyright notice and this permission notice shall be
+     included in all copies or substantial portions of the Software.
+ 
+     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+     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 includes Flot:
+ 
+     Copyright (c) 2007-2009 IOLA and Ole Laursen
+ 
+     Available under the MIT License (see above)
+ 
+     Flot bundles additional works:
+ 
+     jquery.pie.js
+     * Created by Brian Medendorp, June 2009
+     * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+ 
+     jquery.flot.resize.js
+     * Inline dependency:
+      * jQuery resize event - v1.1 - 3/14/2010
+      * http://benalman.com/projects/jquery-resize-plugin/
+      *
+      * Copyright (c) 2010 "Cowboy" Ben Alman
+      * Dual licensed under the MIT and GPL licenses.
+      * http://benalman.com/about/license/
+ 
+     distributed under the MIT license (see above)
+ 
+ **********
+ 
+ This product includes jline:
+ 
+     The BSD License
+ 
+     Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>
+     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 JLine 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.
+ 
+ **********
+ 
 -This product includes Apache Commons Math:
++This product includes Apache Commons Math3:
++
++    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
+     THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR
+     IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES
+     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE
+     OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY
+     OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR
+     USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF
+     THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4)
+     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,
+     INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF
+     ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF
+     PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER
+     SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT
+     (INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE,
+     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.
 -
 -    - 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.
 -    ===============================================================================
 -
+     Copyright and license statement for the original Mersenne twister C
+     routines translated in MersenneTwister class in package
 -    org.apache.commons.math.random:
++    org.apache.commons.math3.random:
+ 
+        Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+        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
+             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.
+ 
++    ===============================================================================
++
++    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.
++
++    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 \u201cAS IS\u201d 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 includes Protocol Buffers:
+ 
+     Copyright 2014, Google Inc. 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 Google Inc. 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.
+ 
+     Code generated by the Protocol Buffer compiler is owned by the owner
+     of the input file used when generating it. This code is not
+     standalone and requires a support library to be linked with it. This
+     support library is itself covered by the above license.
+ 
+ **********
+ 
+ This product includes slf4j:
+ 
+     Copyright (c) 2004-2013 QOS.ch
+     All rights reserved.
+ 
+     Permission is hereby granted, free  of charge, to any person obtaining
+     a  copy  of this  software  and  associated  documentation files  (the
+     "Software"), to  deal in  the Software without  restriction, including
+     without limitation  the rights to  use, copy, modify,  merge, publish,
+     distribute,  sublicense, and/or sell  copies of  the Software,  and to
+     permit persons to whom the Software  is furnished to do so, subject to
+     the following conditions:
+ 
+     The  above  copyright  notice  and  this permission  notice  shall  be
+     included in all copies or substantial portions of the Software.
+ 
+     THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+     EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+     MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+     LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 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 includes javax.servlet-api (http://servlet-spec.java.net):
+ 
+   COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+ 
+   1. Definitions.
+ 
+      1.1. Contributor. means each individual or entity that creates or
+      contributes to the creation of Modifications.
+ 
+      1.2. Contributor Version. means the combination of the Original Software,
+      prior Modifications used by a Contributor (if any), and the Modifications
+      made by that particular Contributor.
+ 
+      1.3. Covered Software. means (a) the Original Software, or (b)
+      Modifications, or (c) the combination of files containing Original Software
+      with files containing Modifications, in each case including portions thereof.
+ 
+      1.4. Executable. means the Covered Software in any form other than Source
+      Code.
+ 
+      1.5. Initial Developer. means the individual or entity that first makes
+      Original Software available under this License.
+ 
+      1.6. Larger Work. means a work which combines Covered Software or portions
+      thereof with code not governed by the terms of this License.
+ 
+      1.7. License. means this document.
+ 
+      1.8. Licensable. means having the right to grant, to the maximum extent
+      possible, whether at the time of the initial grant or subsequently
+      acquired, any and all of the rights conveyed herein.
+ 
+      1.9. Modifications. means the Source Code and Executable form of any of the
+      following:
+ 
+           A. Any file that results from an addition to, deletion from or
+           modification of the contents of a file containing Original Software or
+           previous Modifications;
+ 
+           B. Any new file that contains any part of the Original Software or
+           previous Modification; or
+ 
+           C. Any new file that is contributed or otherwise made available under
+           the terms of this License.
+ 
+      1.10. Original Software. means the Source Code and Executable form of
+      computer software code that is originally released under this License.
+ 
+      1.11. Patent Claims. means any patent claim(s), now owned or hereafter
+      acquired, including without limitation, method, process, and apparatus
+      claims, in any patent Licensable by grantor.
+ 
+      1.12. Source Code. means (a) the common form of computer software code in
+      which modifications are made and (b) associated documentation included in
+      or with such code.
+ 
+      1.13. You. (or .Your.) means an individual or a legal entity exercising
+      rights under, and complying with all of the terms of, this License. For
+      legal entities, .You. includes any entity which controls, is controlled by,
+      or is under common control with You. For purposes of this definition,
+      .control. means (a) the power, direct or indirect, to cause the direction
+      or management of such entity, whether by contract or otherwise, or (b)
+      ownership of more than fifty percent (50%) of the outstanding shares or
+      beneficial ownership of such entity.
+ 
+   2. License Grants.
+ 
+         2.1. The Initial Developer Grant.
+ 
+         Conditioned upon Your compliance with Section 3.1 below and subject to
+         third party intellectual property claims, the Initial Developer hereby
+         grants You a world-wide, royalty-free, non-exclusive license:
+ 
+            (a) under intellectual property rights (other than patent or
+            trademark) Licensable by Initial Developer, to use, reproduce,
+            modify, display, perform, sublicense and distribute the Original
+            Software (or portions thereof), with or without Modifications, and/or
+            as part of a Larger Work; and
+ 
+            (b) under Patent Claims infringed by the making, using or selling of
+            Original Software, to make, have made, use, practice, sell, and offer
+            for sale, and/or otherwise dispose of the Original Software (or
+            portions thereof).
+ 
+           (c) The licenses granted in Sections 2.1(a) and (b) are effective on
+           the date Initial Developer first distributes or otherwise makes the
+           Original Software available to a third party under the terms of this
+           License.
+ 
+           (d) Notwithstanding Section 2.1(b) above, no patent license is
+           granted: (1) for code that You delete from the Original Software, or
+           (2) for infringements caused by: (i) the modification of the Original
+           Software, or (ii) the combination of the Original Software with other
+           software or devices.
+ 
+       2.2. Contributor Grant.
+ 
+       Conditioned upon Your compliance with Section 3.1 below and subject to
+       third party intellectual property claims, each Contributor hereby grants
+       You a world-wide, royalty-free, non-exclusive license:
+ 
+           (a) under intellectual property rights (other than patent or
+           trademark) Licensable by Contributor to use, reproduce, modify,
+           display, perform, sublicense and distribute the Modifications created
+           by such Contributor (or portions thereof), either on an unmodified
+           basis, with other Modifications, as Covered Software and/or as part of
+           a Larger Work; and
+ 
+           (b) under Patent Claims infringed by the making, using, or selling of
+           Modifications made by that Contributor either alone and/or in
+           combination with its Contributor Version (or portions of such
+           combination), to make, use, sell, offer for sale, have made,
+           and/or otherwise dispose of: (1) Modifications made by that
+           Contributor (or portions thereof); and (2) the combination of
+           Modifications made by that Contributor with its Contributor Version
+           (or portions of such combination).
+ 
+           (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
+           on the date Contributor first distributes or otherwise makes the
+           Modifications available to a third party.
+ 
+           (d) Notwithstanding Section 2.2(b) above, no patent license is
+           granted: (1) for any code that Contributor has deleted from the
+           Contributor Version; (2) for infringements caused by: (i) third party
+           modifications of Contributor Version, or (ii) the combination of
+           Modifications made by that Contributor with other software (except as
+           part of the Contributor Version) or other devices; or (3) under
+           Patent Claims infringed by Covered Software in the absence of
+           Modifications made by that Contributor.
+ 
+   3. Distribution Obligations.
+ 
+         3.1. Availability of Source Code.  Any Covered Software that You
+         distribute or otherwise make available in Executable form must also be
+         made available in Source Code form and that Source Code form must be
+         distributed only under the terms of this License. You must include a
+         copy of this License with every copy of the Source Code form of the
+         Covered Software You distribute or otherwise make available. You must
+         inform recipients of any such Covered Software in Executable form as to
+         how they can obtain such Covered Software in Source Code form in a
+         reasonable manner on or through a medium customarily used for software
+         exchange.
+ 
+         3.2. Modifications.  The Modifications that You create or to which You
+         contribute are governed by the terms of this License. You represent that
+         You believe Your Modifications are Your original creation(s) and/or You
+         have sufficient rights to grant the rights conveyed by this License.
+ 
+         3.3. Required Notices.  You must include a notice in each of Your
+         Modifications that identifies You as the Contributor of the
+         Modification. You may not remove or alter any copyright, patent or
+         trademark notices contained within the Covered Software, or any notices
+         of licensing or any descriptive text giving attribution to any
+         Contributor or the Initial Developer.
+ 
+         3.4. Application of Additional Terms.  You may not offer or impose any
+         terms on any Covered Software in Source Code form that alters or
+         restricts the applicable version of this License or the recipients.
+         rights hereunder.  You may choose to offer, and to charge a fee for,
+         warranty, support, indemnity or liability obligations to one or more
+         recipients of Covered Software. However, you may do so only on Your own
+         behalf, and not on behalf of the Initial Developer or any Contributor.
+         You must make it absolutely clear that any such warranty, support,
+         indemnity or liability obligation is offered by You alone, and You
+         hereby agree to indemnify the Initial Developer and every Contributor
+         for any liability incurred by the Initial Developer or such Contributor
+         as a result of warranty, support, indemnity or liability terms You
+         offer.
+ 
+         3.5. Distribution of Executable Versions.  You may distribute the
+         Executable form of the Covered Software under the terms of this License
+         or under the terms of a license of Your choice, which may contain terms
+         different from this License, provided that You are in compliance with
+         the terms of this License and that the license for the Executable form
+         does not attempt to limit or alter the recipient.s rights in the Source
+         Code form from the rights set forth in this License. If You distribute
+         the Covered Software in Executable form under a different license, You
+         must make it absolutely clear that any terms which differ from this
+         License are offered by You alone, not by the Initial Developer or
+         Contributor. You hereby agree to indemnify the Initial Developer and
+         every Contributor for any liability incurred by the Initial Developer or
+         such Contributor as a result of any such terms You offer.
+ 
+         3.6. Larger Works.  You may create a Larger Work by combining Covered
+         Software with other code not governed by the terms of this License and
+         distribute the Larger Work as a single product. In such a case, You must
+         make sure the requirements of this License are fulfilled for the Covered
+         Software.
+ 
+   4. Versions of the License.
+ 
+         4.1. New Versions.  Sun Microsystems, Inc. is the initial license
+         steward and may publish revised and/or new versions of this License from
+         time to time. Each version will be given a distinguishing version
+         number. Except as provided in Section 4.3, no one other than the license
+         steward has the right to modify this License.
+ 
+         4.2. Effect of New Versions.  You may always continue to use, distribute
+         or otherwise make the Covered Software available under the terms of the
+         version of the License under which You originally received the Covered
+         Software. If the Initial Developer includes a notice in the Original
+         Software prohibiting it from being distributed or otherwise made
+         available under any subsequent version of the License, You must
+         distribute and make the Covered Software available under the terms of
+         the version of the License under which You originally received the
+         Covered Software. Otherwise, You may also choose to use, distribute or
+         otherwise make the Covered Software available under the terms of any
+         subsequent version of the License published by the license steward.
+ 
+         4.3. Modified Versions.  When You are an Initial Developer and You want
+         to create a new license for Your Original Software, You may create and
+         use a modified version of this License if You: (a) rename the license
+         and remove any references to the name of the license steward (except to
+         note that the license differs from this License); and (b) otherwise
+         make it clear that the license contains terms which differ from this
+         License.
+ 
+   5. DISCLAIMER OF WARRANTY.
+ 
+      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS,
+      WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+      WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
+      DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE
+      ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS
+      WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU
+      (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
+      NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY
+      CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
+      SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+ 
+   6. TERMINATION.
+ 
+         6.1. This License and the rights granted hereunder will terminate
+         automatically if You fail to comply with terms herein and fail to cure
+         such breach within 30 days of becoming aware of the breach. Provisions
+         which, by their nature, must remain in effect beyond the termination of
+         this License shall survive.
+ 
+         6.2. If You assert a patent infringement claim (excluding declaratory
+         judgment actions) against Initial Developer or a Contributor (the
+         Initial Developer or Contributor against whom You assert such
+         claim is referred to as .Participant.) alleging that the
+         Participant Software (meaning the Contributor Version where the
+         Participant is a Contributor or the Original Software where the
+         Participant is the Initial Developer) directly or indirectly
+         infringes any patent, then any and all rights granted directly or
+         indirectly to You by such Participant, the Initial Developer (if the
+         Initial Developer is not the Participant) and all Contributors
+         under Sections 2.1 and/or 2.2 of this License shall, upon 60 days
+         notice from Participant terminate prospectively and automatically at
+         the expiration of such 60 day notice period, unless if within such
+         60 day period You withdraw Your claim with respect to the
+         Participant Software against such Participant either unilaterally or
+         pursuant to a written agreement with Participant.
+ 
+         6.3. In the event of termination under Sections 6.1 or 6.2 above, all
+         end user licenses that have been validly granted by You or any
+         distributor hereunder prior to termination (excluding licenses granted
+         to You by any distributor) shall survive termination.
+ 
+   7. LIMITATION OF LIABILITY.
+ 
+      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
+      NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER,
+      ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY
+      SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT,
+      SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING,
+      WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
+      STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL
+      DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
+      POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY
+      TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY.S
+      NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME
+      JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+      CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
+      YOU.
+ 
+   8. U.S. GOVERNMENT END USERS.
+ 
+      The Covered Software is a .commercial item,. as that term is defined in 48
+      C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as
+      that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and .commercial
+      computer software documentation. as such terms are used in 48 C.F.R. 12.212
+      (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+      through 227.7202-4 (June 1995), all U.S. Government End Users acquire
+      Covered Software with only those rights set forth herein. This U.S.
+      Government Rights clause is in lieu of, and supersedes, any other FAR,
+      DFAR, or other clause or provision that addresses Government rights in
+      computer software under this License.
+ 
+   9. MISCELLANEOUS.
+ 
+      This License represents the complete agreement concerning subject matter
+      hereof. If any provision of this License is held to be unenforceable, such
+      provision shall be reformed only to the extent necessary to make it
+      enforceable.  This License shall be governed by the law of the jurisdiction
+      specified in a notice contained within the Original Software (except to the
+      extent applicable law, if any, provides otherwise), excluding such
+      jurisdiction.s conflict-of-law provisions. Any litigation relating to this
+      License shall be subject to the jurisdiction of the courts located in the
+      jurisdiction and venue specified in a notice contained within the Original
+      Software, with the losing party responsible for costs, including, without
+      limitation, court costs and reasonable attorneys. fees and expenses. The
+      application of the United Nations Convention on Contracts for the
+      International Sale of Goods is expressly excluded. Any law or regulation
+      which provides that the language of a contract shall be construed against
+      the drafter shall not apply to this License. You agree that You alone are
+      responsible for compliance with the United States export administration
+      regulations (and the export control laws and regulation of any other countries)
+      when You use, distribute or otherwise make available any Covered Software.
+ 
+   10. RESPONSIBILITY FOR CLAIMS.
+ 
+      As between Initial Developer and the Contributors, each party is
+      responsible for claims and damages arising, directly or indirectly, out of
+      its utilization of rights under this License and You agree to work with
+      Initial Developer and Contributors to distribute such responsibility on an
+      equitable basis. Nothing herein is intended or shall be deemed to
+      constitute any admission of liability.
+ 
+      NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
+      LICENSE (CDDL)
+ 
+      The code released under the CDDL shall be governed by the laws of the State
+      of California (excluding conflict-of-law provisions). Any litigation
+      relating to this License shall be subject to the jurisdiction of the
+      Federal Courts of the Northern District of California and the state courts
+      of the State of California, with venue lying in Santa Clara County,
+      California.
+ 
+ **********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/394ad086/assemble/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --cc assemble/src/main/resources/NOTICE
index 0000000,f6370f2..b19c90a
mode 000000,100644..100644
--- a/assemble/src/main/resources/NOTICE
+++ b/assemble/src/main/resources/NOTICE
@@@ -1,0 -1,61 +1,23 @@@
+ Apache Accumulo
+ Copyright 2011-2016 The Apache Software Foundation
+ 
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+ 
+ **********
+ 
+ This product includes JCommander (https://github.com/cbeust/jcommander),
+ Copyright 2010 Cedric Beust cedric@beust.com.
+ 
+ **********
+ 
 -This product includes Apache Commons Math (https://commons.apache.org/proper/commons-math/).
 -Copyright 2001-2010 The Apache Software Foundation
 -
 -From commons-math NOTICE.txt:
 -
 -    ===============================================================================
 -    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
 -    ===============================================================================
 -
 -    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.
 -    ===============================================================================
 -
 -    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
 -    ===============================================================================
++From Apache Commons Math3:
++
++    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/394ad086/core/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/394ad086/examples/simple/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/394ad086/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/394ad086/server/base/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/394ad086/server/monitor/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/394ad086/server/tserver/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/394ad086/shell/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/394ad086/test/pom.xml
----------------------------------------------------------------------


[12/18] accumulo git commit: ACCUMULO-4384 Simplify rat excludes

Posted by ct...@apache.org.
ACCUMULO-4384 Simplify rat excludes

Use wildcards and parent pom inheritance to simplify apache-rat-plugin
excludes. Renames (with a move) the bin-LICENSE and bin-NOTICE files so
rat will exclude them by default to further simplify configuration.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0fdd52a7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0fdd52a7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0fdd52a7

Branch: refs/heads/1.8
Commit: 0fdd52a71922a12749029c525386b72774afba05
Parents: dbdba2f
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Jul 21 17:39:43 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jul 21 18:12:49 2016 -0400

----------------------------------------------------------------------
 assemble/bin-LICENSE                       | 883 ------------------------
 assemble/bin-NOTICE                        |  61 --
 assemble/pom.xml                           |  17 -
 assemble/src/main/assemblies/component.xml |  22 +-
 assemble/src/main/resources/LICENSE        | 883 ++++++++++++++++++++++++
 assemble/src/main/resources/NOTICE         |  61 ++
 core/pom.xml                               |  12 +-
 examples/simple/pom.xml                    |  12 -
 pom.xml                                    |   3 +-
 server/monitor/pom.xml                     |   3 -
 server/tserver/pom.xml                     |   3 -
 test/pom.xml                               |   3 -
 12 files changed, 958 insertions(+), 1005 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/bin-LICENSE
----------------------------------------------------------------------
diff --git a/assemble/bin-LICENSE b/assemble/bin-LICENSE
deleted file mode 100644
index 9cfab86..0000000
--- a/assemble/bin-LICENSE
+++ /dev/null
@@ -1,883 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-**********
-
-APACHE ACCUMULO SUBCOMPONENTS:
-
-The Apache Accumulo project contains subcomponents with separate copyright
-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 includes software from the European Commission project OneLab:
-
-* BloomFilter.java
-* DynamicBloomFilter.java
-* Filter.java
-
-    Copyright (c) 2005, European Commission project OneLab under contract 034819
-    (http://www.one-lab.org)
-
-    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 the University Catholique de Louvain - UCL
-       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.
-
-**********
-
-This product includes JQuery:
-
-    Copyright 2011, John Resig
-    Dual licensed under the MIT or GPL Version 2 licenses.
-    http://jquery.org/license
-
-    Includes Sizzle.js
-    http://sizzlejs.com/
-    Copyright 2011, The Dojo Foundation
-    Released under the MIT, BSD, and GPL Licenses.
-
-    Distributed under the MIT License:
-
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use,
-    copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following
-    conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-    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 includes Flot:
-
-    Copyright (c) 2007-2009 IOLA and Ole Laursen
-
-    Available under the MIT License (see above)
-
-    Flot bundles additional works:
-
-    jquery.pie.js
-    * Created by Brian Medendorp, June 2009
-    * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
-
-    jquery.flot.resize.js
-    * Inline dependency:
-     * jQuery resize event - v1.1 - 3/14/2010
-     * http://benalman.com/projects/jquery-resize-plugin/
-     *
-     * Copyright (c) 2010 "Cowboy" Ben Alman
-     * Dual licensed under the MIT and GPL licenses.
-     * http://benalman.com/about/license/
-
-    distributed under the MIT license (see above)
-
-**********
-
-This product includes jline:
-
-    The BSD License
-
-    Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>
-    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 JLine 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.
-
-**********
-
-This product includes Apache Commons Math:
-
-    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
-    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
-    THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES
-    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE
-    OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY
-    OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR
-    USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF
-    THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4)
-    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,
-    INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF
-    ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF
-    PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER
-    SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT
-    (INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE,
-    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:
-
-
-    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.
-
-    - 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.
-    ===============================================================================
-
-    Copyright and license statement for the original Mersenne twister C
-    routines translated in MersenneTwister class in package
-    org.apache.commons.math.random:
-
-       Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
-       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
-            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.
-
-
-**********
-
-This product includes slf4j:
-
-    Copyright (c) 2004-2013 QOS.ch
-    All rights reserved.
-
-    Permission is hereby granted, free  of charge, to any person obtaining
-    a  copy  of this  software  and  associated  documentation files  (the
-    "Software"), to  deal in  the Software without  restriction, including
-    without limitation  the rights to  use, copy, modify,  merge, publish,
-    distribute,  sublicense, and/or sell  copies of  the Software,  and to
-    permit persons to whom the Software  is furnished to do so, subject to
-    the following conditions:
-
-    The  above  copyright  notice  and  this permission  notice  shall  be
-    included in all copies or substantial portions of the Software.
-
-    THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
-    EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
-    MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 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 includes javax.servlet-api (http://servlet-spec.java.net):
-
-  COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-  1. Definitions.
-
-     1.1. Contributor. means each individual or entity that creates or
-     contributes to the creation of Modifications.
-
-     1.2. Contributor Version. means the combination of the Original Software,
-     prior Modifications used by a Contributor (if any), and the Modifications
-     made by that particular Contributor.
-
-     1.3. Covered Software. means (a) the Original Software, or (b)
-     Modifications, or (c) the combination of files containing Original Software
-     with files containing Modifications, in each case including portions thereof.
-
-     1.4. Executable. means the Covered Software in any form other than Source
-     Code.
-
-     1.5. Initial Developer. means the individual or entity that first makes
-     Original Software available under this License.
-
-     1.6. Larger Work. means a work which combines Covered Software or portions
-     thereof with code not governed by the terms of this License.
-
-     1.7. License. means this document.
-
-     1.8. Licensable. means having the right to grant, to the maximum extent
-     possible, whether at the time of the initial grant or subsequently
-     acquired, any and all of the rights conveyed herein.
-
-     1.9. Modifications. means the Source Code and Executable form of any of the
-     following:
-
-          A. Any file that results from an addition to, deletion from or
-          modification of the contents of a file containing Original Software or
-          previous Modifications;
-
-          B. Any new file that contains any part of the Original Software or
-          previous Modification; or
-
-          C. Any new file that is contributed or otherwise made available under
-          the terms of this License.
-
-     1.10. Original Software. means the Source Code and Executable form of
-     computer software code that is originally released under this License.
-
-     1.11. Patent Claims. means any patent claim(s), now owned or hereafter
-     acquired, including without limitation, method, process, and apparatus
-     claims, in any patent Licensable by grantor.
-
-     1.12. Source Code. means (a) the common form of computer software code in
-     which modifications are made and (b) associated documentation included in
-     or with such code.
-
-     1.13. You. (or .Your.) means an individual or a legal entity exercising
-     rights under, and complying with all of the terms of, this License. For
-     legal entities, .You. includes any entity which controls, is controlled by,
-     or is under common control with You. For purposes of this definition,
-     .control. means (a) the power, direct or indirect, to cause the direction
-     or management of such entity, whether by contract or otherwise, or (b)
-     ownership of more than fifty percent (50%) of the outstanding shares or
-     beneficial ownership of such entity.
-
-  2. License Grants.
-
-        2.1. The Initial Developer Grant.
-
-        Conditioned upon Your compliance with Section 3.1 below and subject to
-        third party intellectual property claims, the Initial Developer hereby
-        grants You a world-wide, royalty-free, non-exclusive license:
-
-           (a) under intellectual property rights (other than patent or
-           trademark) Licensable by Initial Developer, to use, reproduce,
-           modify, display, perform, sublicense and distribute the Original
-           Software (or portions thereof), with or without Modifications, and/or
-           as part of a Larger Work; and
-
-           (b) under Patent Claims infringed by the making, using or selling of
-           Original Software, to make, have made, use, practice, sell, and offer
-           for sale, and/or otherwise dispose of the Original Software (or
-           portions thereof).
-
-          (c) The licenses granted in Sections 2.1(a) and (b) are effective on
-          the date Initial Developer first distributes or otherwise makes the
-          Original Software available to a third party under the terms of this
-          License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: (1) for code that You delete from the Original Software, or
-          (2) for infringements caused by: (i) the modification of the Original
-          Software, or (ii) the combination of the Original Software with other
-          software or devices.
-
-      2.2. Contributor Grant.
-
-      Conditioned upon Your compliance with Section 3.1 below and subject to
-      third party intellectual property claims, each Contributor hereby grants
-      You a world-wide, royalty-free, non-exclusive license:
-
-          (a) under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications created
-          by such Contributor (or portions thereof), either on an unmodified
-          basis, with other Modifications, as Covered Software and/or as part of
-          a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or selling of
-          Modifications made by that Contributor either alone and/or in
-          combination with its Contributor Version (or portions of such
-          combination), to make, use, sell, offer for sale, have made,
-          and/or otherwise dispose of: (1) Modifications made by that
-          Contributor (or portions thereof); and (2) the combination of
-          Modifications made by that Contributor with its Contributor Version
-          (or portions of such combination).
-
-          (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
-          on the date Contributor first distributes or otherwise makes the
-          Modifications available to a third party.
-
-          (d) Notwithstanding Section 2.2(b) above, no patent license is
-          granted: (1) for any code that Contributor has deleted from the
-          Contributor Version; (2) for infringements caused by: (i) third party
-          modifications of Contributor Version, or (ii) the combination of
-          Modifications made by that Contributor with other software (except as
-          part of the Contributor Version) or other devices; or (3) under
-          Patent Claims infringed by Covered Software in the absence of
-          Modifications made by that Contributor.
-
-  3. Distribution Obligations.
-
-        3.1. Availability of Source Code.  Any Covered Software that You
-        distribute or otherwise make available in Executable form must also be
-        made available in Source Code form and that Source Code form must be
-        distributed only under the terms of this License. You must include a
-        copy of this License with every copy of the Source Code form of the
-        Covered Software You distribute or otherwise make available. You must
-        inform recipients of any such Covered Software in Executable form as to
-        how they can obtain such Covered Software in Source Code form in a
-        reasonable manner on or through a medium customarily used for software
-        exchange.
-
-        3.2. Modifications.  The Modifications that You create or to which You
-        contribute are governed by the terms of this License. You represent that
-        You believe Your Modifications are Your original creation(s) and/or You
-        have sufficient rights to grant the rights conveyed by this License.
-
-        3.3. Required Notices.  You must include a notice in each of Your
-        Modifications that identifies You as the Contributor of the
-        Modification. You may not remove or alter any copyright, patent or
-        trademark notices contained within the Covered Software, or any notices
-        of licensing or any descriptive text giving attribution to any
-        Contributor or the Initial Developer.
-
-        3.4. Application of Additional Terms.  You may not offer or impose any
-        terms on any Covered Software in Source Code form that alters or
-        restricts the applicable version of this License or the recipients.
-        rights hereunder.  You may choose to offer, and to charge a fee for,
-        warranty, support, indemnity or liability obligations to one or more
-        recipients of Covered Software. However, you may do so only on Your own
-        behalf, and not on behalf of the Initial Developer or any Contributor.
-        You must make it absolutely clear that any such warranty, support,
-        indemnity or liability obligation is offered by You alone, and You
-        hereby agree to indemnify the Initial Developer and every Contributor
-        for any liability incurred by the Initial Developer or such Contributor
-        as a result of warranty, support, indemnity or liability terms You
-        offer.
-
-        3.5. Distribution of Executable Versions.  You may distribute the
-        Executable form of the Covered Software under the terms of this License
-        or under the terms of a license of Your choice, which may contain terms
-        different from this License, provided that You are in compliance with
-        the terms of this License and that the license for the Executable form
-        does not attempt to limit or alter the recipient.s rights in the Source
-        Code form from the rights set forth in this License. If You distribute
-        the Covered Software in Executable form under a different license, You
-        must make it absolutely clear that any terms which differ from this
-        License are offered by You alone, not by the Initial Developer or
-        Contributor. You hereby agree to indemnify the Initial Developer and
-        every Contributor for any liability incurred by the Initial Developer or
-        such Contributor as a result of any such terms You offer.
-
-        3.6. Larger Works.  You may create a Larger Work by combining Covered
-        Software with other code not governed by the terms of this License and
-        distribute the Larger Work as a single product. In such a case, You must
-        make sure the requirements of this License are fulfilled for the Covered
-        Software.
-
-  4. Versions of the License.
-
-        4.1. New Versions.  Sun Microsystems, Inc. is the initial license
-        steward and may publish revised and/or new versions of this License from
-        time to time. Each version will be given a distinguishing version
-        number. Except as provided in Section 4.3, no one other than the license
-        steward has the right to modify this License.
-
-        4.2. Effect of New Versions.  You may always continue to use, distribute
-        or otherwise make the Covered Software available under the terms of the
-        version of the License under which You originally received the Covered
-        Software. If the Initial Developer includes a notice in the Original
-        Software prohibiting it from being distributed or otherwise made
-        available under any subsequent version of the License, You must
-        distribute and make the Covered Software available under the terms of
-        the version of the License under which You originally received the
-        Covered Software. Otherwise, You may also choose to use, distribute or
-        otherwise make the Covered Software available under the terms of any
-        subsequent version of the License published by the license steward.
-
-        4.3. Modified Versions.  When You are an Initial Developer and You want
-        to create a new license for Your Original Software, You may create and
-        use a modified version of this License if You: (a) rename the license
-        and remove any references to the name of the license steward (except to
-        note that the license differs from this License); and (b) otherwise
-        make it clear that the license contains terms which differ from this
-        License.
-
-  5. DISCLAIMER OF WARRANTY.
-
-     COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE
-     ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS
-     WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU
-     (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
-     NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY
-     CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
-     SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-  6. TERMINATION.
-
-        6.1. This License and the rights granted hereunder will terminate
-        automatically if You fail to comply with terms herein and fail to cure
-        such breach within 30 days of becoming aware of the breach. Provisions
-        which, by their nature, must remain in effect beyond the termination of
-        this License shall survive.
-
-        6.2. If You assert a patent infringement claim (excluding declaratory
-        judgment actions) against Initial Developer or a Contributor (the
-        Initial Developer or Contributor against whom You assert such
-        claim is referred to as .Participant.) alleging that the
-        Participant Software (meaning the Contributor Version where the
-        Participant is a Contributor or the Original Software where the
-        Participant is the Initial Developer) directly or indirectly
-        infringes any patent, then any and all rights granted directly or
-        indirectly to You by such Participant, the Initial Developer (if the
-        Initial Developer is not the Participant) and all Contributors
-        under Sections 2.1 and/or 2.2 of this License shall, upon 60 days
-        notice from Participant terminate prospectively and automatically at
-        the expiration of such 60 day notice period, unless if within such
-        60 day period You withdraw Your claim with respect to the
-        Participant Software against such Participant either unilaterally or
-        pursuant to a written agreement with Participant.
-
-        6.3. In the event of termination under Sections 6.1 or 6.2 above, all
-        end user licenses that have been validly granted by You or any
-        distributor hereunder prior to termination (excluding licenses granted
-        to You by any distributor) shall survive termination.
-
-  7. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
-     NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER,
-     ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY
-     SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT,
-     SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING,
-     WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
-     STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL
-     DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
-     POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY
-     TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY.S
-     NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME
-     JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-     CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
-     YOU.
-
-  8. U.S. GOVERNMENT END USERS.
-
-     The Covered Software is a .commercial item,. as that term is defined in 48
-     C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as
-     that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and .commercial
-     computer software documentation. as such terms are used in 48 C.F.R. 12.212
-     (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-     through 227.7202-4 (June 1995), all U.S. Government End Users acquire
-     Covered Software with only those rights set forth herein. This U.S.
-     Government Rights clause is in lieu of, and supersedes, any other FAR,
-     DFAR, or other clause or provision that addresses Government rights in
-     computer software under this License.
-
-  9. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject matter
-     hereof. If any provision of this License is held to be unenforceable, such
-     provision shall be reformed only to the extent necessary to make it
-     enforceable.  This License shall be governed by the law of the jurisdiction
-     specified in a notice contained within the Original Software (except to the
-     extent applicable law, if any, provides otherwise), excluding such
-     jurisdiction.s conflict-of-law provisions. Any litigation relating to this
-     License shall be subject to the jurisdiction of the courts located in the
-     jurisdiction and venue specified in a notice contained within the Original
-     Software, with the losing party responsible for costs, including, without
-     limitation, court costs and reasonable attorneys. fees and expenses. The
-     application of the United Nations Convention on Contracts for the
-     International Sale of Goods is expressly excluded. Any law or regulation
-     which provides that the language of a contract shall be construed against
-     the drafter shall not apply to this License. You agree that You alone are
-     responsible for compliance with the United States export administration
-     regulations (and the export control laws and regulation of any other countries)
-     when You use, distribute or otherwise make available any Covered Software.
-
-  10. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly, out of
-     its utilization of rights under this License and You agree to work with
-     Initial Developer and Contributors to distribute such responsibility on an
-     equitable basis. Nothing herein is intended or shall be deemed to
-     constitute any admission of liability.
-
-     NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
-     LICENSE (CDDL)
-
-     The code released under the CDDL shall be governed by the laws of the State
-     of California (excluding conflict-of-law provisions). Any litigation
-     relating to this License shall be subject to the jurisdiction of the
-     Federal Courts of the Northern District of California and the state courts
-     of the State of California, with venue lying in Santa Clara County,
-     California.
-
-**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/bin-NOTICE
----------------------------------------------------------------------
diff --git a/assemble/bin-NOTICE b/assemble/bin-NOTICE
deleted file mode 100644
index f6370f2..0000000
--- a/assemble/bin-NOTICE
+++ /dev/null
@@ -1,61 +0,0 @@
-Apache Accumulo
-Copyright 2011-2016 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-**********
-
-This product includes JCommander (https://github.com/cbeust/jcommander),
-Copyright 2010 Cedric Beust cedric@beust.com.
-
-**********
-
-This product includes Apache Commons Math (https://commons.apache.org/proper/commons-math/).
-Copyright 2001-2010 The Apache Software Foundation
-
-From commons-math NOTICE.txt:
-
-    ===============================================================================
-    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
-    ===============================================================================
-
-    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.
-    ===============================================================================
-
-    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 Jetty (http://eclipse.org/jetty)
-Copyright 1996-2009 Mort Bay Consulting Pty. Ltd.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 7f41b4f..c9bd8c5 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -162,23 +162,6 @@
     </dependency>
   </dependencies>
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <configuration>
-            <excludes>
-              <exclude>bin-LICENSE</exclude>
-              <exclude>bin-NOTICE</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/src/main/assemblies/component.xml
----------------------------------------------------------------------
diff --git a/assemble/src/main/assemblies/component.xml b/assemble/src/main/assemblies/component.xml
index 525e635..b9ea051 100644
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@ -247,17 +247,15 @@
         <include>README</include>
       </includes>
     </fileSet>
-  </fileSets>
-  <files>
-    <file>
-      <source>bin-NOTICE</source>
-      <destName>NOTICE</destName>
-      <fileMode>0644</fileMode>
-    </file>
-    <file>
-      <source>bin-LICENSE</source>
-      <destName>LICENSE</destName>
+    <fileSet>
+      <directory>src/main/resources</directory>
+      <directoryMode>0755</directoryMode>
       <fileMode>0644</fileMode>
-    </file>
-  </files>
+      <outputDirectory>.</outputDirectory>
+      <includes>
+        <include>LICENSE</include>
+        <include>NOTICE</include>
+      </includes>
+    </fileSet>
+  </fileSets>
 </component>


[06/18] accumulo git commit: ACCUMULO-4384 Simplify rat excludes

Posted by ct...@apache.org.
ACCUMULO-4384 Simplify rat excludes

Use wildcards and parent pom inheritance to simplify apache-rat-plugin
excludes. Renames (with a move) the bin-LICENSE and bin-NOTICE files so
rat will exclude them by default to further simplify configuration.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0fdd52a7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0fdd52a7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0fdd52a7

Branch: refs/heads/master
Commit: 0fdd52a71922a12749029c525386b72774afba05
Parents: dbdba2f
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Jul 21 17:39:43 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jul 21 18:12:49 2016 -0400

----------------------------------------------------------------------
 assemble/bin-LICENSE                       | 883 ------------------------
 assemble/bin-NOTICE                        |  61 --
 assemble/pom.xml                           |  17 -
 assemble/src/main/assemblies/component.xml |  22 +-
 assemble/src/main/resources/LICENSE        | 883 ++++++++++++++++++++++++
 assemble/src/main/resources/NOTICE         |  61 ++
 core/pom.xml                               |  12 +-
 examples/simple/pom.xml                    |  12 -
 pom.xml                                    |   3 +-
 server/monitor/pom.xml                     |   3 -
 server/tserver/pom.xml                     |   3 -
 test/pom.xml                               |   3 -
 12 files changed, 958 insertions(+), 1005 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/bin-LICENSE
----------------------------------------------------------------------
diff --git a/assemble/bin-LICENSE b/assemble/bin-LICENSE
deleted file mode 100644
index 9cfab86..0000000
--- a/assemble/bin-LICENSE
+++ /dev/null
@@ -1,883 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-**********
-
-APACHE ACCUMULO SUBCOMPONENTS:
-
-The Apache Accumulo project contains subcomponents with separate copyright
-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 includes software from the European Commission project OneLab:
-
-* BloomFilter.java
-* DynamicBloomFilter.java
-* Filter.java
-
-    Copyright (c) 2005, European Commission project OneLab under contract 034819
-    (http://www.one-lab.org)
-
-    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 the University Catholique de Louvain - UCL
-       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.
-
-**********
-
-This product includes JQuery:
-
-    Copyright 2011, John Resig
-    Dual licensed under the MIT or GPL Version 2 licenses.
-    http://jquery.org/license
-
-    Includes Sizzle.js
-    http://sizzlejs.com/
-    Copyright 2011, The Dojo Foundation
-    Released under the MIT, BSD, and GPL Licenses.
-
-    Distributed under the MIT License:
-
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use,
-    copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following
-    conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-    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 includes Flot:
-
-    Copyright (c) 2007-2009 IOLA and Ole Laursen
-
-    Available under the MIT License (see above)
-
-    Flot bundles additional works:
-
-    jquery.pie.js
-    * Created by Brian Medendorp, June 2009
-    * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
-
-    jquery.flot.resize.js
-    * Inline dependency:
-     * jQuery resize event - v1.1 - 3/14/2010
-     * http://benalman.com/projects/jquery-resize-plugin/
-     *
-     * Copyright (c) 2010 "Cowboy" Ben Alman
-     * Dual licensed under the MIT and GPL licenses.
-     * http://benalman.com/about/license/
-
-    distributed under the MIT license (see above)
-
-**********
-
-This product includes jline:
-
-    The BSD License
-
-    Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>
-    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 JLine 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.
-
-**********
-
-This product includes Apache Commons Math:
-
-    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
-    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
-    THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES
-    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE
-    OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY
-    OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR
-    USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF
-    THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4)
-    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,
-    INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF
-    ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF
-    PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER
-    SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT
-    (INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE,
-    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:
-
-
-    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.
-
-    - 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.
-    ===============================================================================
-
-    Copyright and license statement for the original Mersenne twister C
-    routines translated in MersenneTwister class in package
-    org.apache.commons.math.random:
-
-       Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
-       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
-            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.
-
-
-**********
-
-This product includes slf4j:
-
-    Copyright (c) 2004-2013 QOS.ch
-    All rights reserved.
-
-    Permission is hereby granted, free  of charge, to any person obtaining
-    a  copy  of this  software  and  associated  documentation files  (the
-    "Software"), to  deal in  the Software without  restriction, including
-    without limitation  the rights to  use, copy, modify,  merge, publish,
-    distribute,  sublicense, and/or sell  copies of  the Software,  and to
-    permit persons to whom the Software  is furnished to do so, subject to
-    the following conditions:
-
-    The  above  copyright  notice  and  this permission  notice  shall  be
-    included in all copies or substantial portions of the Software.
-
-    THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
-    EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
-    MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 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 includes javax.servlet-api (http://servlet-spec.java.net):
-
-  COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-  1. Definitions.
-
-     1.1. Contributor. means each individual or entity that creates or
-     contributes to the creation of Modifications.
-
-     1.2. Contributor Version. means the combination of the Original Software,
-     prior Modifications used by a Contributor (if any), and the Modifications
-     made by that particular Contributor.
-
-     1.3. Covered Software. means (a) the Original Software, or (b)
-     Modifications, or (c) the combination of files containing Original Software
-     with files containing Modifications, in each case including portions thereof.
-
-     1.4. Executable. means the Covered Software in any form other than Source
-     Code.
-
-     1.5. Initial Developer. means the individual or entity that first makes
-     Original Software available under this License.
-
-     1.6. Larger Work. means a work which combines Covered Software or portions
-     thereof with code not governed by the terms of this License.
-
-     1.7. License. means this document.
-
-     1.8. Licensable. means having the right to grant, to the maximum extent
-     possible, whether at the time of the initial grant or subsequently
-     acquired, any and all of the rights conveyed herein.
-
-     1.9. Modifications. means the Source Code and Executable form of any of the
-     following:
-
-          A. Any file that results from an addition to, deletion from or
-          modification of the contents of a file containing Original Software or
-          previous Modifications;
-
-          B. Any new file that contains any part of the Original Software or
-          previous Modification; or
-
-          C. Any new file that is contributed or otherwise made available under
-          the terms of this License.
-
-     1.10. Original Software. means the Source Code and Executable form of
-     computer software code that is originally released under this License.
-
-     1.11. Patent Claims. means any patent claim(s), now owned or hereafter
-     acquired, including without limitation, method, process, and apparatus
-     claims, in any patent Licensable by grantor.
-
-     1.12. Source Code. means (a) the common form of computer software code in
-     which modifications are made and (b) associated documentation included in
-     or with such code.
-
-     1.13. You. (or .Your.) means an individual or a legal entity exercising
-     rights under, and complying with all of the terms of, this License. For
-     legal entities, .You. includes any entity which controls, is controlled by,
-     or is under common control with You. For purposes of this definition,
-     .control. means (a) the power, direct or indirect, to cause the direction
-     or management of such entity, whether by contract or otherwise, or (b)
-     ownership of more than fifty percent (50%) of the outstanding shares or
-     beneficial ownership of such entity.
-
-  2. License Grants.
-
-        2.1. The Initial Developer Grant.
-
-        Conditioned upon Your compliance with Section 3.1 below and subject to
-        third party intellectual property claims, the Initial Developer hereby
-        grants You a world-wide, royalty-free, non-exclusive license:
-
-           (a) under intellectual property rights (other than patent or
-           trademark) Licensable by Initial Developer, to use, reproduce,
-           modify, display, perform, sublicense and distribute the Original
-           Software (or portions thereof), with or without Modifications, and/or
-           as part of a Larger Work; and
-
-           (b) under Patent Claims infringed by the making, using or selling of
-           Original Software, to make, have made, use, practice, sell, and offer
-           for sale, and/or otherwise dispose of the Original Software (or
-           portions thereof).
-
-          (c) The licenses granted in Sections 2.1(a) and (b) are effective on
-          the date Initial Developer first distributes or otherwise makes the
-          Original Software available to a third party under the terms of this
-          License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: (1) for code that You delete from the Original Software, or
-          (2) for infringements caused by: (i) the modification of the Original
-          Software, or (ii) the combination of the Original Software with other
-          software or devices.
-
-      2.2. Contributor Grant.
-
-      Conditioned upon Your compliance with Section 3.1 below and subject to
-      third party intellectual property claims, each Contributor hereby grants
-      You a world-wide, royalty-free, non-exclusive license:
-
-          (a) under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications created
-          by such Contributor (or portions thereof), either on an unmodified
-          basis, with other Modifications, as Covered Software and/or as part of
-          a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or selling of
-          Modifications made by that Contributor either alone and/or in
-          combination with its Contributor Version (or portions of such
-          combination), to make, use, sell, offer for sale, have made,
-          and/or otherwise dispose of: (1) Modifications made by that
-          Contributor (or portions thereof); and (2) the combination of
-          Modifications made by that Contributor with its Contributor Version
-          (or portions of such combination).
-
-          (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
-          on the date Contributor first distributes or otherwise makes the
-          Modifications available to a third party.
-
-          (d) Notwithstanding Section 2.2(b) above, no patent license is
-          granted: (1) for any code that Contributor has deleted from the
-          Contributor Version; (2) for infringements caused by: (i) third party
-          modifications of Contributor Version, or (ii) the combination of
-          Modifications made by that Contributor with other software (except as
-          part of the Contributor Version) or other devices; or (3) under
-          Patent Claims infringed by Covered Software in the absence of
-          Modifications made by that Contributor.
-
-  3. Distribution Obligations.
-
-        3.1. Availability of Source Code.  Any Covered Software that You
-        distribute or otherwise make available in Executable form must also be
-        made available in Source Code form and that Source Code form must be
-        distributed only under the terms of this License. You must include a
-        copy of this License with every copy of the Source Code form of the
-        Covered Software You distribute or otherwise make available. You must
-        inform recipients of any such Covered Software in Executable form as to
-        how they can obtain such Covered Software in Source Code form in a
-        reasonable manner on or through a medium customarily used for software
-        exchange.
-
-        3.2. Modifications.  The Modifications that You create or to which You
-        contribute are governed by the terms of this License. You represent that
-        You believe Your Modifications are Your original creation(s) and/or You
-        have sufficient rights to grant the rights conveyed by this License.
-
-        3.3. Required Notices.  You must include a notice in each of Your
-        Modifications that identifies You as the Contributor of the
-        Modification. You may not remove or alter any copyright, patent or
-        trademark notices contained within the Covered Software, or any notices
-        of licensing or any descriptive text giving attribution to any
-        Contributor or the Initial Developer.
-
-        3.4. Application of Additional Terms.  You may not offer or impose any
-        terms on any Covered Software in Source Code form that alters or
-        restricts the applicable version of this License or the recipients.
-        rights hereunder.  You may choose to offer, and to charge a fee for,
-        warranty, support, indemnity or liability obligations to one or more
-        recipients of Covered Software. However, you may do so only on Your own
-        behalf, and not on behalf of the Initial Developer or any Contributor.
-        You must make it absolutely clear that any such warranty, support,
-        indemnity or liability obligation is offered by You alone, and You
-        hereby agree to indemnify the Initial Developer and every Contributor
-        for any liability incurred by the Initial Developer or such Contributor
-        as a result of warranty, support, indemnity or liability terms You
-        offer.
-
-        3.5. Distribution of Executable Versions.  You may distribute the
-        Executable form of the Covered Software under the terms of this License
-        or under the terms of a license of Your choice, which may contain terms
-        different from this License, provided that You are in compliance with
-        the terms of this License and that the license for the Executable form
-        does not attempt to limit or alter the recipient.s rights in the Source
-        Code form from the rights set forth in this License. If You distribute
-        the Covered Software in Executable form under a different license, You
-        must make it absolutely clear that any terms which differ from this
-        License are offered by You alone, not by the Initial Developer or
-        Contributor. You hereby agree to indemnify the Initial Developer and
-        every Contributor for any liability incurred by the Initial Developer or
-        such Contributor as a result of any such terms You offer.
-
-        3.6. Larger Works.  You may create a Larger Work by combining Covered
-        Software with other code not governed by the terms of this License and
-        distribute the Larger Work as a single product. In such a case, You must
-        make sure the requirements of this License are fulfilled for the Covered
-        Software.
-
-  4. Versions of the License.
-
-        4.1. New Versions.  Sun Microsystems, Inc. is the initial license
-        steward and may publish revised and/or new versions of this License from
-        time to time. Each version will be given a distinguishing version
-        number. Except as provided in Section 4.3, no one other than the license
-        steward has the right to modify this License.
-
-        4.2. Effect of New Versions.  You may always continue to use, distribute
-        or otherwise make the Covered Software available under the terms of the
-        version of the License under which You originally received the Covered
-        Software. If the Initial Developer includes a notice in the Original
-        Software prohibiting it from being distributed or otherwise made
-        available under any subsequent version of the License, You must
-        distribute and make the Covered Software available under the terms of
-        the version of the License under which You originally received the
-        Covered Software. Otherwise, You may also choose to use, distribute or
-        otherwise make the Covered Software available under the terms of any
-        subsequent version of the License published by the license steward.
-
-        4.3. Modified Versions.  When You are an Initial Developer and You want
-        to create a new license for Your Original Software, You may create and
-        use a modified version of this License if You: (a) rename the license
-        and remove any references to the name of the license steward (except to
-        note that the license differs from this License); and (b) otherwise
-        make it clear that the license contains terms which differ from this
-        License.
-
-  5. DISCLAIMER OF WARRANTY.
-
-     COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE
-     ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS
-     WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU
-     (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
-     NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY
-     CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
-     SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-  6. TERMINATION.
-
-        6.1. This License and the rights granted hereunder will terminate
-        automatically if You fail to comply with terms herein and fail to cure
-        such breach within 30 days of becoming aware of the breach. Provisions
-        which, by their nature, must remain in effect beyond the termination of
-        this License shall survive.
-
-        6.2. If You assert a patent infringement claim (excluding declaratory
-        judgment actions) against Initial Developer or a Contributor (the
-        Initial Developer or Contributor against whom You assert such
-        claim is referred to as .Participant.) alleging that the
-        Participant Software (meaning the Contributor Version where the
-        Participant is a Contributor or the Original Software where the
-        Participant is the Initial Developer) directly or indirectly
-        infringes any patent, then any and all rights granted directly or
-        indirectly to You by such Participant, the Initial Developer (if the
-        Initial Developer is not the Participant) and all Contributors
-        under Sections 2.1 and/or 2.2 of this License shall, upon 60 days
-        notice from Participant terminate prospectively and automatically at
-        the expiration of such 60 day notice period, unless if within such
-        60 day period You withdraw Your claim with respect to the
-        Participant Software against such Participant either unilaterally or
-        pursuant to a written agreement with Participant.
-
-        6.3. In the event of termination under Sections 6.1 or 6.2 above, all
-        end user licenses that have been validly granted by You or any
-        distributor hereunder prior to termination (excluding licenses granted
-        to You by any distributor) shall survive termination.
-
-  7. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
-     NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER,
-     ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY
-     SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT,
-     SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING,
-     WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
-     STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL
-     DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
-     POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY
-     TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY.S
-     NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME
-     JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-     CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
-     YOU.
-
-  8. U.S. GOVERNMENT END USERS.
-
-     The Covered Software is a .commercial item,. as that term is defined in 48
-     C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as
-     that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and .commercial
-     computer software documentation. as such terms are used in 48 C.F.R. 12.212
-     (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-     through 227.7202-4 (June 1995), all U.S. Government End Users acquire
-     Covered Software with only those rights set forth herein. This U.S.
-     Government Rights clause is in lieu of, and supersedes, any other FAR,
-     DFAR, or other clause or provision that addresses Government rights in
-     computer software under this License.
-
-  9. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject matter
-     hereof. If any provision of this License is held to be unenforceable, such
-     provision shall be reformed only to the extent necessary to make it
-     enforceable.  This License shall be governed by the law of the jurisdiction
-     specified in a notice contained within the Original Software (except to the
-     extent applicable law, if any, provides otherwise), excluding such
-     jurisdiction.s conflict-of-law provisions. Any litigation relating to this
-     License shall be subject to the jurisdiction of the courts located in the
-     jurisdiction and venue specified in a notice contained within the Original
-     Software, with the losing party responsible for costs, including, without
-     limitation, court costs and reasonable attorneys. fees and expenses. The
-     application of the United Nations Convention on Contracts for the
-     International Sale of Goods is expressly excluded. Any law or regulation
-     which provides that the language of a contract shall be construed against
-     the drafter shall not apply to this License. You agree that You alone are
-     responsible for compliance with the United States export administration
-     regulations (and the export control laws and regulation of any other countries)
-     when You use, distribute or otherwise make available any Covered Software.
-
-  10. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly, out of
-     its utilization of rights under this License and You agree to work with
-     Initial Developer and Contributors to distribute such responsibility on an
-     equitable basis. Nothing herein is intended or shall be deemed to
-     constitute any admission of liability.
-
-     NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
-     LICENSE (CDDL)
-
-     The code released under the CDDL shall be governed by the laws of the State
-     of California (excluding conflict-of-law provisions). Any litigation
-     relating to this License shall be subject to the jurisdiction of the
-     Federal Courts of the Northern District of California and the state courts
-     of the State of California, with venue lying in Santa Clara County,
-     California.
-
-**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/bin-NOTICE
----------------------------------------------------------------------
diff --git a/assemble/bin-NOTICE b/assemble/bin-NOTICE
deleted file mode 100644
index f6370f2..0000000
--- a/assemble/bin-NOTICE
+++ /dev/null
@@ -1,61 +0,0 @@
-Apache Accumulo
-Copyright 2011-2016 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-**********
-
-This product includes JCommander (https://github.com/cbeust/jcommander),
-Copyright 2010 Cedric Beust cedric@beust.com.
-
-**********
-
-This product includes Apache Commons Math (https://commons.apache.org/proper/commons-math/).
-Copyright 2001-2010 The Apache Software Foundation
-
-From commons-math NOTICE.txt:
-
-    ===============================================================================
-    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
-    ===============================================================================
-
-    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.
-    ===============================================================================
-
-    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 Jetty (http://eclipse.org/jetty)
-Copyright 1996-2009 Mort Bay Consulting Pty. Ltd.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 7f41b4f..c9bd8c5 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -162,23 +162,6 @@
     </dependency>
   </dependencies>
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <configuration>
-            <excludes>
-              <exclude>bin-LICENSE</exclude>
-              <exclude>bin-NOTICE</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/src/main/assemblies/component.xml
----------------------------------------------------------------------
diff --git a/assemble/src/main/assemblies/component.xml b/assemble/src/main/assemblies/component.xml
index 525e635..b9ea051 100644
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@ -247,17 +247,15 @@
         <include>README</include>
       </includes>
     </fileSet>
-  </fileSets>
-  <files>
-    <file>
-      <source>bin-NOTICE</source>
-      <destName>NOTICE</destName>
-      <fileMode>0644</fileMode>
-    </file>
-    <file>
-      <source>bin-LICENSE</source>
-      <destName>LICENSE</destName>
+    <fileSet>
+      <directory>src/main/resources</directory>
+      <directoryMode>0755</directoryMode>
       <fileMode>0644</fileMode>
-    </file>
-  </files>
+      <outputDirectory>.</outputDirectory>
+      <includes>
+        <include>LICENSE</include>
+        <include>NOTICE</include>
+      </includes>
+    </fileSet>
+  </fileSets>
 </component>


[08/18] accumulo git commit: ACCUMULO-4384 Simplify rat excludes

Posted by ct...@apache.org.
ACCUMULO-4384 Simplify rat excludes

Use wildcards and parent pom inheritance to simplify apache-rat-plugin
excludes. Renames (with a move) the bin-LICENSE and bin-NOTICE files so
rat will exclude them by default to further simplify configuration.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0fdd52a7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0fdd52a7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0fdd52a7

Branch: refs/heads/1.6
Commit: 0fdd52a71922a12749029c525386b72774afba05
Parents: dbdba2f
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Jul 21 17:39:43 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jul 21 18:12:49 2016 -0400

----------------------------------------------------------------------
 assemble/bin-LICENSE                       | 883 ------------------------
 assemble/bin-NOTICE                        |  61 --
 assemble/pom.xml                           |  17 -
 assemble/src/main/assemblies/component.xml |  22 +-
 assemble/src/main/resources/LICENSE        | 883 ++++++++++++++++++++++++
 assemble/src/main/resources/NOTICE         |  61 ++
 core/pom.xml                               |  12 +-
 examples/simple/pom.xml                    |  12 -
 pom.xml                                    |   3 +-
 server/monitor/pom.xml                     |   3 -
 server/tserver/pom.xml                     |   3 -
 test/pom.xml                               |   3 -
 12 files changed, 958 insertions(+), 1005 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/bin-LICENSE
----------------------------------------------------------------------
diff --git a/assemble/bin-LICENSE b/assemble/bin-LICENSE
deleted file mode 100644
index 9cfab86..0000000
--- a/assemble/bin-LICENSE
+++ /dev/null
@@ -1,883 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-**********
-
-APACHE ACCUMULO SUBCOMPONENTS:
-
-The Apache Accumulo project contains subcomponents with separate copyright
-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 includes software from the European Commission project OneLab:
-
-* BloomFilter.java
-* DynamicBloomFilter.java
-* Filter.java
-
-    Copyright (c) 2005, European Commission project OneLab under contract 034819
-    (http://www.one-lab.org)
-
-    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 the University Catholique de Louvain - UCL
-       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.
-
-**********
-
-This product includes JQuery:
-
-    Copyright 2011, John Resig
-    Dual licensed under the MIT or GPL Version 2 licenses.
-    http://jquery.org/license
-
-    Includes Sizzle.js
-    http://sizzlejs.com/
-    Copyright 2011, The Dojo Foundation
-    Released under the MIT, BSD, and GPL Licenses.
-
-    Distributed under the MIT License:
-
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use,
-    copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following
-    conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-    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 includes Flot:
-
-    Copyright (c) 2007-2009 IOLA and Ole Laursen
-
-    Available under the MIT License (see above)
-
-    Flot bundles additional works:
-
-    jquery.pie.js
-    * Created by Brian Medendorp, June 2009
-    * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
-
-    jquery.flot.resize.js
-    * Inline dependency:
-     * jQuery resize event - v1.1 - 3/14/2010
-     * http://benalman.com/projects/jquery-resize-plugin/
-     *
-     * Copyright (c) 2010 "Cowboy" Ben Alman
-     * Dual licensed under the MIT and GPL licenses.
-     * http://benalman.com/about/license/
-
-    distributed under the MIT license (see above)
-
-**********
-
-This product includes jline:
-
-    The BSD License
-
-    Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>
-    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 JLine 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.
-
-**********
-
-This product includes Apache Commons Math:
-
-    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
-    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
-    THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES
-    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE
-    OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY
-    OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR
-    USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF
-    THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4)
-    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,
-    INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF
-    ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF
-    PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER
-    SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT
-    (INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE,
-    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:
-
-
-    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.
-
-    - 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.
-    ===============================================================================
-
-    Copyright and license statement for the original Mersenne twister C
-    routines translated in MersenneTwister class in package
-    org.apache.commons.math.random:
-
-       Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
-       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
-            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.
-
-
-**********
-
-This product includes slf4j:
-
-    Copyright (c) 2004-2013 QOS.ch
-    All rights reserved.
-
-    Permission is hereby granted, free  of charge, to any person obtaining
-    a  copy  of this  software  and  associated  documentation files  (the
-    "Software"), to  deal in  the Software without  restriction, including
-    without limitation  the rights to  use, copy, modify,  merge, publish,
-    distribute,  sublicense, and/or sell  copies of  the Software,  and to
-    permit persons to whom the Software  is furnished to do so, subject to
-    the following conditions:
-
-    The  above  copyright  notice  and  this permission  notice  shall  be
-    included in all copies or substantial portions of the Software.
-
-    THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
-    EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
-    MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 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 includes javax.servlet-api (http://servlet-spec.java.net):
-
-  COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-  1. Definitions.
-
-     1.1. Contributor. means each individual or entity that creates or
-     contributes to the creation of Modifications.
-
-     1.2. Contributor Version. means the combination of the Original Software,
-     prior Modifications used by a Contributor (if any), and the Modifications
-     made by that particular Contributor.
-
-     1.3. Covered Software. means (a) the Original Software, or (b)
-     Modifications, or (c) the combination of files containing Original Software
-     with files containing Modifications, in each case including portions thereof.
-
-     1.4. Executable. means the Covered Software in any form other than Source
-     Code.
-
-     1.5. Initial Developer. means the individual or entity that first makes
-     Original Software available under this License.
-
-     1.6. Larger Work. means a work which combines Covered Software or portions
-     thereof with code not governed by the terms of this License.
-
-     1.7. License. means this document.
-
-     1.8. Licensable. means having the right to grant, to the maximum extent
-     possible, whether at the time of the initial grant or subsequently
-     acquired, any and all of the rights conveyed herein.
-
-     1.9. Modifications. means the Source Code and Executable form of any of the
-     following:
-
-          A. Any file that results from an addition to, deletion from or
-          modification of the contents of a file containing Original Software or
-          previous Modifications;
-
-          B. Any new file that contains any part of the Original Software or
-          previous Modification; or
-
-          C. Any new file that is contributed or otherwise made available under
-          the terms of this License.
-
-     1.10. Original Software. means the Source Code and Executable form of
-     computer software code that is originally released under this License.
-
-     1.11. Patent Claims. means any patent claim(s), now owned or hereafter
-     acquired, including without limitation, method, process, and apparatus
-     claims, in any patent Licensable by grantor.
-
-     1.12. Source Code. means (a) the common form of computer software code in
-     which modifications are made and (b) associated documentation included in
-     or with such code.
-
-     1.13. You. (or .Your.) means an individual or a legal entity exercising
-     rights under, and complying with all of the terms of, this License. For
-     legal entities, .You. includes any entity which controls, is controlled by,
-     or is under common control with You. For purposes of this definition,
-     .control. means (a) the power, direct or indirect, to cause the direction
-     or management of such entity, whether by contract or otherwise, or (b)
-     ownership of more than fifty percent (50%) of the outstanding shares or
-     beneficial ownership of such entity.
-
-  2. License Grants.
-
-        2.1. The Initial Developer Grant.
-
-        Conditioned upon Your compliance with Section 3.1 below and subject to
-        third party intellectual property claims, the Initial Developer hereby
-        grants You a world-wide, royalty-free, non-exclusive license:
-
-           (a) under intellectual property rights (other than patent or
-           trademark) Licensable by Initial Developer, to use, reproduce,
-           modify, display, perform, sublicense and distribute the Original
-           Software (or portions thereof), with or without Modifications, and/or
-           as part of a Larger Work; and
-
-           (b) under Patent Claims infringed by the making, using or selling of
-           Original Software, to make, have made, use, practice, sell, and offer
-           for sale, and/or otherwise dispose of the Original Software (or
-           portions thereof).
-
-          (c) The licenses granted in Sections 2.1(a) and (b) are effective on
-          the date Initial Developer first distributes or otherwise makes the
-          Original Software available to a third party under the terms of this
-          License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: (1) for code that You delete from the Original Software, or
-          (2) for infringements caused by: (i) the modification of the Original
-          Software, or (ii) the combination of the Original Software with other
-          software or devices.
-
-      2.2. Contributor Grant.
-
-      Conditioned upon Your compliance with Section 3.1 below and subject to
-      third party intellectual property claims, each Contributor hereby grants
-      You a world-wide, royalty-free, non-exclusive license:
-
-          (a) under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications created
-          by such Contributor (or portions thereof), either on an unmodified
-          basis, with other Modifications, as Covered Software and/or as part of
-          a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or selling of
-          Modifications made by that Contributor either alone and/or in
-          combination with its Contributor Version (or portions of such
-          combination), to make, use, sell, offer for sale, have made,
-          and/or otherwise dispose of: (1) Modifications made by that
-          Contributor (or portions thereof); and (2) the combination of
-          Modifications made by that Contributor with its Contributor Version
-          (or portions of such combination).
-
-          (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
-          on the date Contributor first distributes or otherwise makes the
-          Modifications available to a third party.
-
-          (d) Notwithstanding Section 2.2(b) above, no patent license is
-          granted: (1) for any code that Contributor has deleted from the
-          Contributor Version; (2) for infringements caused by: (i) third party
-          modifications of Contributor Version, or (ii) the combination of
-          Modifications made by that Contributor with other software (except as
-          part of the Contributor Version) or other devices; or (3) under
-          Patent Claims infringed by Covered Software in the absence of
-          Modifications made by that Contributor.
-
-  3. Distribution Obligations.
-
-        3.1. Availability of Source Code.  Any Covered Software that You
-        distribute or otherwise make available in Executable form must also be
-        made available in Source Code form and that Source Code form must be
-        distributed only under the terms of this License. You must include a
-        copy of this License with every copy of the Source Code form of the
-        Covered Software You distribute or otherwise make available. You must
-        inform recipients of any such Covered Software in Executable form as to
-        how they can obtain such Covered Software in Source Code form in a
-        reasonable manner on or through a medium customarily used for software
-        exchange.
-
-        3.2. Modifications.  The Modifications that You create or to which You
-        contribute are governed by the terms of this License. You represent that
-        You believe Your Modifications are Your original creation(s) and/or You
-        have sufficient rights to grant the rights conveyed by this License.
-
-        3.3. Required Notices.  You must include a notice in each of Your
-        Modifications that identifies You as the Contributor of the
-        Modification. You may not remove or alter any copyright, patent or
-        trademark notices contained within the Covered Software, or any notices
-        of licensing or any descriptive text giving attribution to any
-        Contributor or the Initial Developer.
-
-        3.4. Application of Additional Terms.  You may not offer or impose any
-        terms on any Covered Software in Source Code form that alters or
-        restricts the applicable version of this License or the recipients.
-        rights hereunder.  You may choose to offer, and to charge a fee for,
-        warranty, support, indemnity or liability obligations to one or more
-        recipients of Covered Software. However, you may do so only on Your own
-        behalf, and not on behalf of the Initial Developer or any Contributor.
-        You must make it absolutely clear that any such warranty, support,
-        indemnity or liability obligation is offered by You alone, and You
-        hereby agree to indemnify the Initial Developer and every Contributor
-        for any liability incurred by the Initial Developer or such Contributor
-        as a result of warranty, support, indemnity or liability terms You
-        offer.
-
-        3.5. Distribution of Executable Versions.  You may distribute the
-        Executable form of the Covered Software under the terms of this License
-        or under the terms of a license of Your choice, which may contain terms
-        different from this License, provided that You are in compliance with
-        the terms of this License and that the license for the Executable form
-        does not attempt to limit or alter the recipient.s rights in the Source
-        Code form from the rights set forth in this License. If You distribute
-        the Covered Software in Executable form under a different license, You
-        must make it absolutely clear that any terms which differ from this
-        License are offered by You alone, not by the Initial Developer or
-        Contributor. You hereby agree to indemnify the Initial Developer and
-        every Contributor for any liability incurred by the Initial Developer or
-        such Contributor as a result of any such terms You offer.
-
-        3.6. Larger Works.  You may create a Larger Work by combining Covered
-        Software with other code not governed by the terms of this License and
-        distribute the Larger Work as a single product. In such a case, You must
-        make sure the requirements of this License are fulfilled for the Covered
-        Software.
-
-  4. Versions of the License.
-
-        4.1. New Versions.  Sun Microsystems, Inc. is the initial license
-        steward and may publish revised and/or new versions of this License from
-        time to time. Each version will be given a distinguishing version
-        number. Except as provided in Section 4.3, no one other than the license
-        steward has the right to modify this License.
-
-        4.2. Effect of New Versions.  You may always continue to use, distribute
-        or otherwise make the Covered Software available under the terms of the
-        version of the License under which You originally received the Covered
-        Software. If the Initial Developer includes a notice in the Original
-        Software prohibiting it from being distributed or otherwise made
-        available under any subsequent version of the License, You must
-        distribute and make the Covered Software available under the terms of
-        the version of the License under which You originally received the
-        Covered Software. Otherwise, You may also choose to use, distribute or
-        otherwise make the Covered Software available under the terms of any
-        subsequent version of the License published by the license steward.
-
-        4.3. Modified Versions.  When You are an Initial Developer and You want
-        to create a new license for Your Original Software, You may create and
-        use a modified version of this License if You: (a) rename the license
-        and remove any references to the name of the license steward (except to
-        note that the license differs from this License); and (b) otherwise
-        make it clear that the license contains terms which differ from this
-        License.
-
-  5. DISCLAIMER OF WARRANTY.
-
-     COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE
-     ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS
-     WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU
-     (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
-     NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY
-     CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
-     SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-  6. TERMINATION.
-
-        6.1. This License and the rights granted hereunder will terminate
-        automatically if You fail to comply with terms herein and fail to cure
-        such breach within 30 days of becoming aware of the breach. Provisions
-        which, by their nature, must remain in effect beyond the termination of
-        this License shall survive.
-
-        6.2. If You assert a patent infringement claim (excluding declaratory
-        judgment actions) against Initial Developer or a Contributor (the
-        Initial Developer or Contributor against whom You assert such
-        claim is referred to as .Participant.) alleging that the
-        Participant Software (meaning the Contributor Version where the
-        Participant is a Contributor or the Original Software where the
-        Participant is the Initial Developer) directly or indirectly
-        infringes any patent, then any and all rights granted directly or
-        indirectly to You by such Participant, the Initial Developer (if the
-        Initial Developer is not the Participant) and all Contributors
-        under Sections 2.1 and/or 2.2 of this License shall, upon 60 days
-        notice from Participant terminate prospectively and automatically at
-        the expiration of such 60 day notice period, unless if within such
-        60 day period You withdraw Your claim with respect to the
-        Participant Software against such Participant either unilaterally or
-        pursuant to a written agreement with Participant.
-
-        6.3. In the event of termination under Sections 6.1 or 6.2 above, all
-        end user licenses that have been validly granted by You or any
-        distributor hereunder prior to termination (excluding licenses granted
-        to You by any distributor) shall survive termination.
-
-  7. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
-     NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER,
-     ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY
-     SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT,
-     SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING,
-     WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
-     STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL
-     DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
-     POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY
-     TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY.S
-     NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME
-     JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-     CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
-     YOU.
-
-  8. U.S. GOVERNMENT END USERS.
-
-     The Covered Software is a .commercial item,. as that term is defined in 48
-     C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as
-     that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and .commercial
-     computer software documentation. as such terms are used in 48 C.F.R. 12.212
-     (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-     through 227.7202-4 (June 1995), all U.S. Government End Users acquire
-     Covered Software with only those rights set forth herein. This U.S.
-     Government Rights clause is in lieu of, and supersedes, any other FAR,
-     DFAR, or other clause or provision that addresses Government rights in
-     computer software under this License.
-
-  9. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject matter
-     hereof. If any provision of this License is held to be unenforceable, such
-     provision shall be reformed only to the extent necessary to make it
-     enforceable.  This License shall be governed by the law of the jurisdiction
-     specified in a notice contained within the Original Software (except to the
-     extent applicable law, if any, provides otherwise), excluding such
-     jurisdiction.s conflict-of-law provisions. Any litigation relating to this
-     License shall be subject to the jurisdiction of the courts located in the
-     jurisdiction and venue specified in a notice contained within the Original
-     Software, with the losing party responsible for costs, including, without
-     limitation, court costs and reasonable attorneys. fees and expenses. The
-     application of the United Nations Convention on Contracts for the
-     International Sale of Goods is expressly excluded. Any law or regulation
-     which provides that the language of a contract shall be construed against
-     the drafter shall not apply to this License. You agree that You alone are
-     responsible for compliance with the United States export administration
-     regulations (and the export control laws and regulation of any other countries)
-     when You use, distribute or otherwise make available any Covered Software.
-
-  10. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly, out of
-     its utilization of rights under this License and You agree to work with
-     Initial Developer and Contributors to distribute such responsibility on an
-     equitable basis. Nothing herein is intended or shall be deemed to
-     constitute any admission of liability.
-
-     NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
-     LICENSE (CDDL)
-
-     The code released under the CDDL shall be governed by the laws of the State
-     of California (excluding conflict-of-law provisions). Any litigation
-     relating to this License shall be subject to the jurisdiction of the
-     Federal Courts of the Northern District of California and the state courts
-     of the State of California, with venue lying in Santa Clara County,
-     California.
-
-**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/bin-NOTICE
----------------------------------------------------------------------
diff --git a/assemble/bin-NOTICE b/assemble/bin-NOTICE
deleted file mode 100644
index f6370f2..0000000
--- a/assemble/bin-NOTICE
+++ /dev/null
@@ -1,61 +0,0 @@
-Apache Accumulo
-Copyright 2011-2016 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-**********
-
-This product includes JCommander (https://github.com/cbeust/jcommander),
-Copyright 2010 Cedric Beust cedric@beust.com.
-
-**********
-
-This product includes Apache Commons Math (https://commons.apache.org/proper/commons-math/).
-Copyright 2001-2010 The Apache Software Foundation
-
-From commons-math NOTICE.txt:
-
-    ===============================================================================
-    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
-    ===============================================================================
-
-    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.
-    ===============================================================================
-
-    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 Jetty (http://eclipse.org/jetty)
-Copyright 1996-2009 Mort Bay Consulting Pty. Ltd.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 7f41b4f..c9bd8c5 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -162,23 +162,6 @@
     </dependency>
   </dependencies>
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <configuration>
-            <excludes>
-              <exclude>bin-LICENSE</exclude>
-              <exclude>bin-NOTICE</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/src/main/assemblies/component.xml
----------------------------------------------------------------------
diff --git a/assemble/src/main/assemblies/component.xml b/assemble/src/main/assemblies/component.xml
index 525e635..b9ea051 100644
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@ -247,17 +247,15 @@
         <include>README</include>
       </includes>
     </fileSet>
-  </fileSets>
-  <files>
-    <file>
-      <source>bin-NOTICE</source>
-      <destName>NOTICE</destName>
-      <fileMode>0644</fileMode>
-    </file>
-    <file>
-      <source>bin-LICENSE</source>
-      <destName>LICENSE</destName>
+    <fileSet>
+      <directory>src/main/resources</directory>
+      <directoryMode>0755</directoryMode>
       <fileMode>0644</fileMode>
-    </file>
-  </files>
+      <outputDirectory>.</outputDirectory>
+      <includes>
+        <include>LICENSE</include>
+        <include>NOTICE</include>
+      </includes>
+    </fileSet>
+  </fileSets>
 </component>


[10/18] accumulo git commit: ACCUMULO-4384 Simplify rat excludes

Posted by ct...@apache.org.
ACCUMULO-4384 Simplify rat excludes

Use wildcards and parent pom inheritance to simplify apache-rat-plugin
excludes. Renames (with a move) the bin-LICENSE and bin-NOTICE files so
rat will exclude them by default to further simplify configuration.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0fdd52a7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0fdd52a7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0fdd52a7

Branch: refs/heads/1.7
Commit: 0fdd52a71922a12749029c525386b72774afba05
Parents: dbdba2f
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Jul 21 17:39:43 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jul 21 18:12:49 2016 -0400

----------------------------------------------------------------------
 assemble/bin-LICENSE                       | 883 ------------------------
 assemble/bin-NOTICE                        |  61 --
 assemble/pom.xml                           |  17 -
 assemble/src/main/assemblies/component.xml |  22 +-
 assemble/src/main/resources/LICENSE        | 883 ++++++++++++++++++++++++
 assemble/src/main/resources/NOTICE         |  61 ++
 core/pom.xml                               |  12 +-
 examples/simple/pom.xml                    |  12 -
 pom.xml                                    |   3 +-
 server/monitor/pom.xml                     |   3 -
 server/tserver/pom.xml                     |   3 -
 test/pom.xml                               |   3 -
 12 files changed, 958 insertions(+), 1005 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/bin-LICENSE
----------------------------------------------------------------------
diff --git a/assemble/bin-LICENSE b/assemble/bin-LICENSE
deleted file mode 100644
index 9cfab86..0000000
--- a/assemble/bin-LICENSE
+++ /dev/null
@@ -1,883 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-**********
-
-APACHE ACCUMULO SUBCOMPONENTS:
-
-The Apache Accumulo project contains subcomponents with separate copyright
-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 includes software from the European Commission project OneLab:
-
-* BloomFilter.java
-* DynamicBloomFilter.java
-* Filter.java
-
-    Copyright (c) 2005, European Commission project OneLab under contract 034819
-    (http://www.one-lab.org)
-
-    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 the University Catholique de Louvain - UCL
-       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.
-
-**********
-
-This product includes JQuery:
-
-    Copyright 2011, John Resig
-    Dual licensed under the MIT or GPL Version 2 licenses.
-    http://jquery.org/license
-
-    Includes Sizzle.js
-    http://sizzlejs.com/
-    Copyright 2011, The Dojo Foundation
-    Released under the MIT, BSD, and GPL Licenses.
-
-    Distributed under the MIT License:
-
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use,
-    copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following
-    conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-    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 includes Flot:
-
-    Copyright (c) 2007-2009 IOLA and Ole Laursen
-
-    Available under the MIT License (see above)
-
-    Flot bundles additional works:
-
-    jquery.pie.js
-    * Created by Brian Medendorp, June 2009
-    * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
-
-    jquery.flot.resize.js
-    * Inline dependency:
-     * jQuery resize event - v1.1 - 3/14/2010
-     * http://benalman.com/projects/jquery-resize-plugin/
-     *
-     * Copyright (c) 2010 "Cowboy" Ben Alman
-     * Dual licensed under the MIT and GPL licenses.
-     * http://benalman.com/about/license/
-
-    distributed under the MIT license (see above)
-
-**********
-
-This product includes jline:
-
-    The BSD License
-
-    Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>
-    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 JLine 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.
-
-**********
-
-This product includes Apache Commons Math:
-
-    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
-    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
-    THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES
-    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE
-    OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY
-    OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR
-    USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF
-    THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4)
-    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,
-    INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF
-    ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF
-    PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER
-    SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT
-    (INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE,
-    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:
-
-
-    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.
-
-    - 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.
-    ===============================================================================
-
-    Copyright and license statement for the original Mersenne twister C
-    routines translated in MersenneTwister class in package
-    org.apache.commons.math.random:
-
-       Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
-       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
-            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.
-
-
-**********
-
-This product includes slf4j:
-
-    Copyright (c) 2004-2013 QOS.ch
-    All rights reserved.
-
-    Permission is hereby granted, free  of charge, to any person obtaining
-    a  copy  of this  software  and  associated  documentation files  (the
-    "Software"), to  deal in  the Software without  restriction, including
-    without limitation  the rights to  use, copy, modify,  merge, publish,
-    distribute,  sublicense, and/or sell  copies of  the Software,  and to
-    permit persons to whom the Software  is furnished to do so, subject to
-    the following conditions:
-
-    The  above  copyright  notice  and  this permission  notice  shall  be
-    included in all copies or substantial portions of the Software.
-
-    THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
-    EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
-    MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 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 includes javax.servlet-api (http://servlet-spec.java.net):
-
-  COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-  1. Definitions.
-
-     1.1. Contributor. means each individual or entity that creates or
-     contributes to the creation of Modifications.
-
-     1.2. Contributor Version. means the combination of the Original Software,
-     prior Modifications used by a Contributor (if any), and the Modifications
-     made by that particular Contributor.
-
-     1.3. Covered Software. means (a) the Original Software, or (b)
-     Modifications, or (c) the combination of files containing Original Software
-     with files containing Modifications, in each case including portions thereof.
-
-     1.4. Executable. means the Covered Software in any form other than Source
-     Code.
-
-     1.5. Initial Developer. means the individual or entity that first makes
-     Original Software available under this License.
-
-     1.6. Larger Work. means a work which combines Covered Software or portions
-     thereof with code not governed by the terms of this License.
-
-     1.7. License. means this document.
-
-     1.8. Licensable. means having the right to grant, to the maximum extent
-     possible, whether at the time of the initial grant or subsequently
-     acquired, any and all of the rights conveyed herein.
-
-     1.9. Modifications. means the Source Code and Executable form of any of the
-     following:
-
-          A. Any file that results from an addition to, deletion from or
-          modification of the contents of a file containing Original Software or
-          previous Modifications;
-
-          B. Any new file that contains any part of the Original Software or
-          previous Modification; or
-
-          C. Any new file that is contributed or otherwise made available under
-          the terms of this License.
-
-     1.10. Original Software. means the Source Code and Executable form of
-     computer software code that is originally released under this License.
-
-     1.11. Patent Claims. means any patent claim(s), now owned or hereafter
-     acquired, including without limitation, method, process, and apparatus
-     claims, in any patent Licensable by grantor.
-
-     1.12. Source Code. means (a) the common form of computer software code in
-     which modifications are made and (b) associated documentation included in
-     or with such code.
-
-     1.13. You. (or .Your.) means an individual or a legal entity exercising
-     rights under, and complying with all of the terms of, this License. For
-     legal entities, .You. includes any entity which controls, is controlled by,
-     or is under common control with You. For purposes of this definition,
-     .control. means (a) the power, direct or indirect, to cause the direction
-     or management of such entity, whether by contract or otherwise, or (b)
-     ownership of more than fifty percent (50%) of the outstanding shares or
-     beneficial ownership of such entity.
-
-  2. License Grants.
-
-        2.1. The Initial Developer Grant.
-
-        Conditioned upon Your compliance with Section 3.1 below and subject to
-        third party intellectual property claims, the Initial Developer hereby
-        grants You a world-wide, royalty-free, non-exclusive license:
-
-           (a) under intellectual property rights (other than patent or
-           trademark) Licensable by Initial Developer, to use, reproduce,
-           modify, display, perform, sublicense and distribute the Original
-           Software (or portions thereof), with or without Modifications, and/or
-           as part of a Larger Work; and
-
-           (b) under Patent Claims infringed by the making, using or selling of
-           Original Software, to make, have made, use, practice, sell, and offer
-           for sale, and/or otherwise dispose of the Original Software (or
-           portions thereof).
-
-          (c) The licenses granted in Sections 2.1(a) and (b) are effective on
-          the date Initial Developer first distributes or otherwise makes the
-          Original Software available to a third party under the terms of this
-          License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: (1) for code that You delete from the Original Software, or
-          (2) for infringements caused by: (i) the modification of the Original
-          Software, or (ii) the combination of the Original Software with other
-          software or devices.
-
-      2.2. Contributor Grant.
-
-      Conditioned upon Your compliance with Section 3.1 below and subject to
-      third party intellectual property claims, each Contributor hereby grants
-      You a world-wide, royalty-free, non-exclusive license:
-
-          (a) under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications created
-          by such Contributor (or portions thereof), either on an unmodified
-          basis, with other Modifications, as Covered Software and/or as part of
-          a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or selling of
-          Modifications made by that Contributor either alone and/or in
-          combination with its Contributor Version (or portions of such
-          combination), to make, use, sell, offer for sale, have made,
-          and/or otherwise dispose of: (1) Modifications made by that
-          Contributor (or portions thereof); and (2) the combination of
-          Modifications made by that Contributor with its Contributor Version
-          (or portions of such combination).
-
-          (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
-          on the date Contributor first distributes or otherwise makes the
-          Modifications available to a third party.
-
-          (d) Notwithstanding Section 2.2(b) above, no patent license is
-          granted: (1) for any code that Contributor has deleted from the
-          Contributor Version; (2) for infringements caused by: (i) third party
-          modifications of Contributor Version, or (ii) the combination of
-          Modifications made by that Contributor with other software (except as
-          part of the Contributor Version) or other devices; or (3) under
-          Patent Claims infringed by Covered Software in the absence of
-          Modifications made by that Contributor.
-
-  3. Distribution Obligations.
-
-        3.1. Availability of Source Code.  Any Covered Software that You
-        distribute or otherwise make available in Executable form must also be
-        made available in Source Code form and that Source Code form must be
-        distributed only under the terms of this License. You must include a
-        copy of this License with every copy of the Source Code form of the
-        Covered Software You distribute or otherwise make available. You must
-        inform recipients of any such Covered Software in Executable form as to
-        how they can obtain such Covered Software in Source Code form in a
-        reasonable manner on or through a medium customarily used for software
-        exchange.
-
-        3.2. Modifications.  The Modifications that You create or to which You
-        contribute are governed by the terms of this License. You represent that
-        You believe Your Modifications are Your original creation(s) and/or You
-        have sufficient rights to grant the rights conveyed by this License.
-
-        3.3. Required Notices.  You must include a notice in each of Your
-        Modifications that identifies You as the Contributor of the
-        Modification. You may not remove or alter any copyright, patent or
-        trademark notices contained within the Covered Software, or any notices
-        of licensing or any descriptive text giving attribution to any
-        Contributor or the Initial Developer.
-
-        3.4. Application of Additional Terms.  You may not offer or impose any
-        terms on any Covered Software in Source Code form that alters or
-        restricts the applicable version of this License or the recipients.
-        rights hereunder.  You may choose to offer, and to charge a fee for,
-        warranty, support, indemnity or liability obligations to one or more
-        recipients of Covered Software. However, you may do so only on Your own
-        behalf, and not on behalf of the Initial Developer or any Contributor.
-        You must make it absolutely clear that any such warranty, support,
-        indemnity or liability obligation is offered by You alone, and You
-        hereby agree to indemnify the Initial Developer and every Contributor
-        for any liability incurred by the Initial Developer or such Contributor
-        as a result of warranty, support, indemnity or liability terms You
-        offer.
-
-        3.5. Distribution of Executable Versions.  You may distribute the
-        Executable form of the Covered Software under the terms of this License
-        or under the terms of a license of Your choice, which may contain terms
-        different from this License, provided that You are in compliance with
-        the terms of this License and that the license for the Executable form
-        does not attempt to limit or alter the recipient.s rights in the Source
-        Code form from the rights set forth in this License. If You distribute
-        the Covered Software in Executable form under a different license, You
-        must make it absolutely clear that any terms which differ from this
-        License are offered by You alone, not by the Initial Developer or
-        Contributor. You hereby agree to indemnify the Initial Developer and
-        every Contributor for any liability incurred by the Initial Developer or
-        such Contributor as a result of any such terms You offer.
-
-        3.6. Larger Works.  You may create a Larger Work by combining Covered
-        Software with other code not governed by the terms of this License and
-        distribute the Larger Work as a single product. In such a case, You must
-        make sure the requirements of this License are fulfilled for the Covered
-        Software.
-
-  4. Versions of the License.
-
-        4.1. New Versions.  Sun Microsystems, Inc. is the initial license
-        steward and may publish revised and/or new versions of this License from
-        time to time. Each version will be given a distinguishing version
-        number. Except as provided in Section 4.3, no one other than the license
-        steward has the right to modify this License.
-
-        4.2. Effect of New Versions.  You may always continue to use, distribute
-        or otherwise make the Covered Software available under the terms of the
-        version of the License under which You originally received the Covered
-        Software. If the Initial Developer includes a notice in the Original
-        Software prohibiting it from being distributed or otherwise made
-        available under any subsequent version of the License, You must
-        distribute and make the Covered Software available under the terms of
-        the version of the License under which You originally received the
-        Covered Software. Otherwise, You may also choose to use, distribute or
-        otherwise make the Covered Software available under the terms of any
-        subsequent version of the License published by the license steward.
-
-        4.3. Modified Versions.  When You are an Initial Developer and You want
-        to create a new license for Your Original Software, You may create and
-        use a modified version of this License if You: (a) rename the license
-        and remove any references to the name of the license steward (except to
-        note that the license differs from this License); and (b) otherwise
-        make it clear that the license contains terms which differ from this
-        License.
-
-  5. DISCLAIMER OF WARRANTY.
-
-     COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE
-     ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS
-     WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU
-     (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
-     NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY
-     CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
-     SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-  6. TERMINATION.
-
-        6.1. This License and the rights granted hereunder will terminate
-        automatically if You fail to comply with terms herein and fail to cure
-        such breach within 30 days of becoming aware of the breach. Provisions
-        which, by their nature, must remain in effect beyond the termination of
-        this License shall survive.
-
-        6.2. If You assert a patent infringement claim (excluding declaratory
-        judgment actions) against Initial Developer or a Contributor (the
-        Initial Developer or Contributor against whom You assert such
-        claim is referred to as .Participant.) alleging that the
-        Participant Software (meaning the Contributor Version where the
-        Participant is a Contributor or the Original Software where the
-        Participant is the Initial Developer) directly or indirectly
-        infringes any patent, then any and all rights granted directly or
-        indirectly to You by such Participant, the Initial Developer (if the
-        Initial Developer is not the Participant) and all Contributors
-        under Sections 2.1 and/or 2.2 of this License shall, upon 60 days
-        notice from Participant terminate prospectively and automatically at
-        the expiration of such 60 day notice period, unless if within such
-        60 day period You withdraw Your claim with respect to the
-        Participant Software against such Participant either unilaterally or
-        pursuant to a written agreement with Participant.
-
-        6.3. In the event of termination under Sections 6.1 or 6.2 above, all
-        end user licenses that have been validly granted by You or any
-        distributor hereunder prior to termination (excluding licenses granted
-        to You by any distributor) shall survive termination.
-
-  7. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
-     NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER,
-     ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY
-     SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT,
-     SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING,
-     WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
-     STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL
-     DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
-     POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY
-     TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY.S
-     NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME
-     JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-     CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
-     YOU.
-
-  8. U.S. GOVERNMENT END USERS.
-
-     The Covered Software is a .commercial item,. as that term is defined in 48
-     C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as
-     that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and .commercial
-     computer software documentation. as such terms are used in 48 C.F.R. 12.212
-     (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-     through 227.7202-4 (June 1995), all U.S. Government End Users acquire
-     Covered Software with only those rights set forth herein. This U.S.
-     Government Rights clause is in lieu of, and supersedes, any other FAR,
-     DFAR, or other clause or provision that addresses Government rights in
-     computer software under this License.
-
-  9. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject matter
-     hereof. If any provision of this License is held to be unenforceable, such
-     provision shall be reformed only to the extent necessary to make it
-     enforceable.  This License shall be governed by the law of the jurisdiction
-     specified in a notice contained within the Original Software (except to the
-     extent applicable law, if any, provides otherwise), excluding such
-     jurisdiction.s conflict-of-law provisions. Any litigation relating to this
-     License shall be subject to the jurisdiction of the courts located in the
-     jurisdiction and venue specified in a notice contained within the Original
-     Software, with the losing party responsible for costs, including, without
-     limitation, court costs and reasonable attorneys. fees and expenses. The
-     application of the United Nations Convention on Contracts for the
-     International Sale of Goods is expressly excluded. Any law or regulation
-     which provides that the language of a contract shall be construed against
-     the drafter shall not apply to this License. You agree that You alone are
-     responsible for compliance with the United States export administration
-     regulations (and the export control laws and regulation of any other countries)
-     when You use, distribute or otherwise make available any Covered Software.
-
-  10. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly, out of
-     its utilization of rights under this License and You agree to work with
-     Initial Developer and Contributors to distribute such responsibility on an
-     equitable basis. Nothing herein is intended or shall be deemed to
-     constitute any admission of liability.
-
-     NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
-     LICENSE (CDDL)
-
-     The code released under the CDDL shall be governed by the laws of the State
-     of California (excluding conflict-of-law provisions). Any litigation
-     relating to this License shall be subject to the jurisdiction of the
-     Federal Courts of the Northern District of California and the state courts
-     of the State of California, with venue lying in Santa Clara County,
-     California.
-
-**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/bin-NOTICE
----------------------------------------------------------------------
diff --git a/assemble/bin-NOTICE b/assemble/bin-NOTICE
deleted file mode 100644
index f6370f2..0000000
--- a/assemble/bin-NOTICE
+++ /dev/null
@@ -1,61 +0,0 @@
-Apache Accumulo
-Copyright 2011-2016 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-**********
-
-This product includes JCommander (https://github.com/cbeust/jcommander),
-Copyright 2010 Cedric Beust cedric@beust.com.
-
-**********
-
-This product includes Apache Commons Math (https://commons.apache.org/proper/commons-math/).
-Copyright 2001-2010 The Apache Software Foundation
-
-From commons-math NOTICE.txt:
-
-    ===============================================================================
-    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
-    ===============================================================================
-
-    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.
-    ===============================================================================
-
-    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 Jetty (http://eclipse.org/jetty)
-Copyright 1996-2009 Mort Bay Consulting Pty. Ltd.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 7f41b4f..c9bd8c5 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -162,23 +162,6 @@
     </dependency>
   </dependencies>
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <configuration>
-            <excludes>
-              <exclude>bin-LICENSE</exclude>
-              <exclude>bin-NOTICE</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/src/main/assemblies/component.xml
----------------------------------------------------------------------
diff --git a/assemble/src/main/assemblies/component.xml b/assemble/src/main/assemblies/component.xml
index 525e635..b9ea051 100644
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@ -247,17 +247,15 @@
         <include>README</include>
       </includes>
     </fileSet>
-  </fileSets>
-  <files>
-    <file>
-      <source>bin-NOTICE</source>
-      <destName>NOTICE</destName>
-      <fileMode>0644</fileMode>
-    </file>
-    <file>
-      <source>bin-LICENSE</source>
-      <destName>LICENSE</destName>
+    <fileSet>
+      <directory>src/main/resources</directory>
+      <directoryMode>0755</directoryMode>
       <fileMode>0644</fileMode>
-    </file>
-  </files>
+      <outputDirectory>.</outputDirectory>
+      <includes>
+        <include>LICENSE</include>
+        <include>NOTICE</include>
+      </includes>
+    </fileSet>
+  </fileSets>
 </component>


[05/18] accumulo git commit: ACCUMULO-4384 Simplify rat excludes

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/src/main/resources/LICENSE
----------------------------------------------------------------------
diff --git a/assemble/src/main/resources/LICENSE b/assemble/src/main/resources/LICENSE
new file mode 100644
index 0000000..9cfab86
--- /dev/null
+++ b/assemble/src/main/resources/LICENSE
@@ -0,0 +1,883 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+**********
+
+APACHE ACCUMULO SUBCOMPONENTS:
+
+The Apache Accumulo project contains subcomponents with separate copyright
+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 includes software from the European Commission project OneLab:
+
+* BloomFilter.java
+* DynamicBloomFilter.java
+* Filter.java
+
+    Copyright (c) 2005, European Commission project OneLab under contract 034819
+    (http://www.one-lab.org)
+
+    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 the University Catholique de Louvain - UCL
+       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.
+
+**********
+
+This product includes JQuery:
+
+    Copyright 2011, John Resig
+    Dual licensed under the MIT or GPL Version 2 licenses.
+    http://jquery.org/license
+
+    Includes Sizzle.js
+    http://sizzlejs.com/
+    Copyright 2011, The Dojo Foundation
+    Released under the MIT, BSD, and GPL Licenses.
+
+    Distributed under the MIT License:
+
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use,
+    copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following
+    conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    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 includes Flot:
+
+    Copyright (c) 2007-2009 IOLA and Ole Laursen
+
+    Available under the MIT License (see above)
+
+    Flot bundles additional works:
+
+    jquery.pie.js
+    * Created by Brian Medendorp, June 2009
+    * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+
+    jquery.flot.resize.js
+    * Inline dependency:
+     * jQuery resize event - v1.1 - 3/14/2010
+     * http://benalman.com/projects/jquery-resize-plugin/
+     *
+     * Copyright (c) 2010 "Cowboy" Ben Alman
+     * Dual licensed under the MIT and GPL licenses.
+     * http://benalman.com/about/license/
+
+    distributed under the MIT license (see above)
+
+**********
+
+This product includes jline:
+
+    The BSD License
+
+    Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>
+    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 JLine 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.
+
+**********
+
+This product includes Apache Commons Math:
+
+    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
+    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
+    THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE
+    OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY
+    OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR
+    USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF
+    THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4)
+    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,
+    INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF
+    ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF
+    PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER
+    SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT
+    (INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE,
+    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:
+
+
+    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.
+
+    - 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.
+    ===============================================================================
+
+    Copyright and license statement for the original Mersenne twister C
+    routines translated in MersenneTwister class in package
+    org.apache.commons.math.random:
+
+       Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+       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
+            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.
+
+
+**********
+
+This product includes slf4j:
+
+    Copyright (c) 2004-2013 QOS.ch
+    All rights reserved.
+
+    Permission is hereby granted, free  of charge, to any person obtaining
+    a  copy  of this  software  and  associated  documentation files  (the
+    "Software"), to  deal in  the Software without  restriction, including
+    without limitation  the rights to  use, copy, modify,  merge, publish,
+    distribute,  sublicense, and/or sell  copies of  the Software,  and to
+    permit persons to whom the Software  is furnished to do so, subject to
+    the following conditions:
+
+    The  above  copyright  notice  and  this permission  notice  shall  be
+    included in all copies or substantial portions of the Software.
+
+    THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+    EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+    MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 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 includes javax.servlet-api (http://servlet-spec.java.net):
+
+  COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+  1. Definitions.
+
+     1.1. Contributor. means each individual or entity that creates or
+     contributes to the creation of Modifications.
+
+     1.2. Contributor Version. means the combination of the Original Software,
+     prior Modifications used by a Contributor (if any), and the Modifications
+     made by that particular Contributor.
+
+     1.3. Covered Software. means (a) the Original Software, or (b)
+     Modifications, or (c) the combination of files containing Original Software
+     with files containing Modifications, in each case including portions thereof.
+
+     1.4. Executable. means the Covered Software in any form other than Source
+     Code.
+
+     1.5. Initial Developer. means the individual or entity that first makes
+     Original Software available under this License.
+
+     1.6. Larger Work. means a work which combines Covered Software or portions
+     thereof with code not governed by the terms of this License.
+
+     1.7. License. means this document.
+
+     1.8. Licensable. means having the right to grant, to the maximum extent
+     possible, whether at the time of the initial grant or subsequently
+     acquired, any and all of the rights conveyed herein.
+
+     1.9. Modifications. means the Source Code and Executable form of any of the
+     following:
+
+          A. Any file that results from an addition to, deletion from or
+          modification of the contents of a file containing Original Software or
+          previous Modifications;
+
+          B. Any new file that contains any part of the Original Software or
+          previous Modification; or
+
+          C. Any new file that is contributed or otherwise made available under
+          the terms of this License.
+
+     1.10. Original Software. means the Source Code and Executable form of
+     computer software code that is originally released under this License.
+
+     1.11. Patent Claims. means any patent claim(s), now owned or hereafter
+     acquired, including without limitation, method, process, and apparatus
+     claims, in any patent Licensable by grantor.
+
+     1.12. Source Code. means (a) the common form of computer software code in
+     which modifications are made and (b) associated documentation included in
+     or with such code.
+
+     1.13. You. (or .Your.) means an individual or a legal entity exercising
+     rights under, and complying with all of the terms of, this License. For
+     legal entities, .You. includes any entity which controls, is controlled by,
+     or is under common control with You. For purposes of this definition,
+     .control. means (a) the power, direct or indirect, to cause the direction
+     or management of such entity, whether by contract or otherwise, or (b)
+     ownership of more than fifty percent (50%) of the outstanding shares or
+     beneficial ownership of such entity.
+
+  2. License Grants.
+
+        2.1. The Initial Developer Grant.
+
+        Conditioned upon Your compliance with Section 3.1 below and subject to
+        third party intellectual property claims, the Initial Developer hereby
+        grants You a world-wide, royalty-free, non-exclusive license:
+
+           (a) under intellectual property rights (other than patent or
+           trademark) Licensable by Initial Developer, to use, reproduce,
+           modify, display, perform, sublicense and distribute the Original
+           Software (or portions thereof), with or without Modifications, and/or
+           as part of a Larger Work; and
+
+           (b) under Patent Claims infringed by the making, using or selling of
+           Original Software, to make, have made, use, practice, sell, and offer
+           for sale, and/or otherwise dispose of the Original Software (or
+           portions thereof).
+
+          (c) The licenses granted in Sections 2.1(a) and (b) are effective on
+          the date Initial Developer first distributes or otherwise makes the
+          Original Software available to a third party under the terms of this
+          License.
+
+          (d) Notwithstanding Section 2.1(b) above, no patent license is
+          granted: (1) for code that You delete from the Original Software, or
+          (2) for infringements caused by: (i) the modification of the Original
+          Software, or (ii) the combination of the Original Software with other
+          software or devices.
+
+      2.2. Contributor Grant.
+
+      Conditioned upon Your compliance with Section 3.1 below and subject to
+      third party intellectual property claims, each Contributor hereby grants
+      You a world-wide, royalty-free, non-exclusive license:
+
+          (a) under intellectual property rights (other than patent or
+          trademark) Licensable by Contributor to use, reproduce, modify,
+          display, perform, sublicense and distribute the Modifications created
+          by such Contributor (or portions thereof), either on an unmodified
+          basis, with other Modifications, as Covered Software and/or as part of
+          a Larger Work; and
+
+          (b) under Patent Claims infringed by the making, using, or selling of
+          Modifications made by that Contributor either alone and/or in
+          combination with its Contributor Version (or portions of such
+          combination), to make, use, sell, offer for sale, have made,
+          and/or otherwise dispose of: (1) Modifications made by that
+          Contributor (or portions thereof); and (2) the combination of
+          Modifications made by that Contributor with its Contributor Version
+          (or portions of such combination).
+
+          (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
+          on the date Contributor first distributes or otherwise makes the
+          Modifications available to a third party.
+
+          (d) Notwithstanding Section 2.2(b) above, no patent license is
+          granted: (1) for any code that Contributor has deleted from the
+          Contributor Version; (2) for infringements caused by: (i) third party
+          modifications of Contributor Version, or (ii) the combination of
+          Modifications made by that Contributor with other software (except as
+          part of the Contributor Version) or other devices; or (3) under
+          Patent Claims infringed by Covered Software in the absence of
+          Modifications made by that Contributor.
+
+  3. Distribution Obligations.
+
+        3.1. Availability of Source Code.  Any Covered Software that You
+        distribute or otherwise make available in Executable form must also be
+        made available in Source Code form and that Source Code form must be
+        distributed only under the terms of this License. You must include a
+        copy of this License with every copy of the Source Code form of the
+        Covered Software You distribute or otherwise make available. You must
+        inform recipients of any such Covered Software in Executable form as to
+        how they can obtain such Covered Software in Source Code form in a
+        reasonable manner on or through a medium customarily used for software
+        exchange.
+
+        3.2. Modifications.  The Modifications that You create or to which You
+        contribute are governed by the terms of this License. You represent that
+        You believe Your Modifications are Your original creation(s) and/or You
+        have sufficient rights to grant the rights conveyed by this License.
+
+        3.3. Required Notices.  You must include a notice in each of Your
+        Modifications that identifies You as the Contributor of the
+        Modification. You may not remove or alter any copyright, patent or
+        trademark notices contained within the Covered Software, or any notices
+        of licensing or any descriptive text giving attribution to any
+        Contributor or the Initial Developer.
+
+        3.4. Application of Additional Terms.  You may not offer or impose any
+        terms on any Covered Software in Source Code form that alters or
+        restricts the applicable version of this License or the recipients.
+        rights hereunder.  You may choose to offer, and to charge a fee for,
+        warranty, support, indemnity or liability obligations to one or more
+        recipients of Covered Software. However, you may do so only on Your own
+        behalf, and not on behalf of the Initial Developer or any Contributor.
+        You must make it absolutely clear that any such warranty, support,
+        indemnity or liability obligation is offered by You alone, and You
+        hereby agree to indemnify the Initial Developer and every Contributor
+        for any liability incurred by the Initial Developer or such Contributor
+        as a result of warranty, support, indemnity or liability terms You
+        offer.
+
+        3.5. Distribution of Executable Versions.  You may distribute the
+        Executable form of the Covered Software under the terms of this License
+        or under the terms of a license of Your choice, which may contain terms
+        different from this License, provided that You are in compliance with
+        the terms of this License and that the license for the Executable form
+        does not attempt to limit or alter the recipient.s rights in the Source
+        Code form from the rights set forth in this License. If You distribute
+        the Covered Software in Executable form under a different license, You
+        must make it absolutely clear that any terms which differ from this
+        License are offered by You alone, not by the Initial Developer or
+        Contributor. You hereby agree to indemnify the Initial Developer and
+        every Contributor for any liability incurred by the Initial Developer or
+        such Contributor as a result of any such terms You offer.
+
+        3.6. Larger Works.  You may create a Larger Work by combining Covered
+        Software with other code not governed by the terms of this License and
+        distribute the Larger Work as a single product. In such a case, You must
+        make sure the requirements of this License are fulfilled for the Covered
+        Software.
+
+  4. Versions of the License.
+
+        4.1. New Versions.  Sun Microsystems, Inc. is the initial license
+        steward and may publish revised and/or new versions of this License from
+        time to time. Each version will be given a distinguishing version
+        number. Except as provided in Section 4.3, no one other than the license
+        steward has the right to modify this License.
+
+        4.2. Effect of New Versions.  You may always continue to use, distribute
+        or otherwise make the Covered Software available under the terms of the
+        version of the License under which You originally received the Covered
+        Software. If the Initial Developer includes a notice in the Original
+        Software prohibiting it from being distributed or otherwise made
+        available under any subsequent version of the License, You must
+        distribute and make the Covered Software available under the terms of
+        the version of the License under which You originally received the
+        Covered Software. Otherwise, You may also choose to use, distribute or
+        otherwise make the Covered Software available under the terms of any
+        subsequent version of the License published by the license steward.
+
+        4.3. Modified Versions.  When You are an Initial Developer and You want
+        to create a new license for Your Original Software, You may create and
+        use a modified version of this License if You: (a) rename the license
+        and remove any references to the name of the license steward (except to
+        note that the license differs from this License); and (b) otherwise
+        make it clear that the license contains terms which differ from this
+        License.
+
+  5. DISCLAIMER OF WARRANTY.
+
+     COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE
+     ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS
+     WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU
+     (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
+     NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY
+     CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
+     SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+  6. TERMINATION.
+
+        6.1. This License and the rights granted hereunder will terminate
+        automatically if You fail to comply with terms herein and fail to cure
+        such breach within 30 days of becoming aware of the breach. Provisions
+        which, by their nature, must remain in effect beyond the termination of
+        this License shall survive.
+
+        6.2. If You assert a patent infringement claim (excluding declaratory
+        judgment actions) against Initial Developer or a Contributor (the
+        Initial Developer or Contributor against whom You assert such
+        claim is referred to as .Participant.) alleging that the
+        Participant Software (meaning the Contributor Version where the
+        Participant is a Contributor or the Original Software where the
+        Participant is the Initial Developer) directly or indirectly
+        infringes any patent, then any and all rights granted directly or
+        indirectly to You by such Participant, the Initial Developer (if the
+        Initial Developer is not the Participant) and all Contributors
+        under Sections 2.1 and/or 2.2 of this License shall, upon 60 days
+        notice from Participant terminate prospectively and automatically at
+        the expiration of such 60 day notice period, unless if within such
+        60 day period You withdraw Your claim with respect to the
+        Participant Software against such Participant either unilaterally or
+        pursuant to a written agreement with Participant.
+
+        6.3. In the event of termination under Sections 6.1 or 6.2 above, all
+        end user licenses that have been validly granted by You or any
+        distributor hereunder prior to termination (excluding licenses granted
+        to You by any distributor) shall survive termination.
+
+  7. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
+     NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER,
+     ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY
+     SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT,
+     SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING,
+     WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
+     STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL
+     DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
+     POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY
+     TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY.S
+     NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME
+     JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+     CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
+     YOU.
+
+  8. U.S. GOVERNMENT END USERS.
+
+     The Covered Software is a .commercial item,. as that term is defined in 48
+     C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as
+     that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and .commercial
+     computer software documentation. as such terms are used in 48 C.F.R. 12.212
+     (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+     through 227.7202-4 (June 1995), all U.S. Government End Users acquire
+     Covered Software with only those rights set forth herein. This U.S.
+     Government Rights clause is in lieu of, and supersedes, any other FAR,
+     DFAR, or other clause or provision that addresses Government rights in
+     computer software under this License.
+
+  9. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject matter
+     hereof. If any provision of this License is held to be unenforceable, such
+     provision shall be reformed only to the extent necessary to make it
+     enforceable.  This License shall be governed by the law of the jurisdiction
+     specified in a notice contained within the Original Software (except to the
+     extent applicable law, if any, provides otherwise), excluding such
+     jurisdiction.s conflict-of-law provisions. Any litigation relating to this
+     License shall be subject to the jurisdiction of the courts located in the
+     jurisdiction and venue specified in a notice contained within the Original
+     Software, with the losing party responsible for costs, including, without
+     limitation, court costs and reasonable attorneys. fees and expenses. The
+     application of the United Nations Convention on Contracts for the
+     International Sale of Goods is expressly excluded. Any law or regulation
+     which provides that the language of a contract shall be construed against
+     the drafter shall not apply to this License. You agree that You alone are
+     responsible for compliance with the United States export administration
+     regulations (and the export control laws and regulation of any other countries)
+     when You use, distribute or otherwise make available any Covered Software.
+
+  10. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is
+     responsible for claims and damages arising, directly or indirectly, out of
+     its utilization of rights under this License and You agree to work with
+     Initial Developer and Contributors to distribute such responsibility on an
+     equitable basis. Nothing herein is intended or shall be deemed to
+     constitute any admission of liability.
+
+     NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
+     LICENSE (CDDL)
+
+     The code released under the CDDL shall be governed by the laws of the State
+     of California (excluding conflict-of-law provisions). Any litigation
+     relating to this License shall be subject to the jurisdiction of the
+     Federal Courts of the Northern District of California and the state courts
+     of the State of California, with venue lying in Santa Clara County,
+     California.
+
+**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/assemble/src/main/resources/NOTICE b/assemble/src/main/resources/NOTICE
new file mode 100644
index 0000000..f6370f2
--- /dev/null
+++ b/assemble/src/main/resources/NOTICE
@@ -0,0 +1,61 @@
+Apache Accumulo
+Copyright 2011-2016 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+**********
+
+This product includes JCommander (https://github.com/cbeust/jcommander),
+Copyright 2010 Cedric Beust cedric@beust.com.
+
+**********
+
+This product includes Apache Commons Math (https://commons.apache.org/proper/commons-math/).
+Copyright 2001-2010 The Apache Software Foundation
+
+From commons-math NOTICE.txt:
+
+    ===============================================================================
+    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
+    ===============================================================================
+
+    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.
+    ===============================================================================
+
+    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 Jetty (http://eclipse.org/jetty)
+Copyright 1996-2009 Mort Bay Consulting Pty. Ltd.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 30468da..b701d8a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -166,16 +166,8 @@
           <configuration>
             <excludes>
               <exclude>src/test/resources/shelltest.txt</exclude>
-              <exclude>src/test/resources/org/apache/accumulo/core/file/rfile/ver_3.rf</exclude>
-              <exclude>src/test/resources/org/apache/accumulo/core/file/rfile/ver_4.rf</exclude>
-              <exclude>src/test/resources/org/apache/accumulo/core/file/rfile/ver_6.rf</exclude>
-              <exclude>src/test/resources/site-cfg.jceks</exclude>
-              <exclude>src/test/resources/accumulo.jceks</exclude>
-              <exclude>src/test/resources/empty.jceks</exclude>
-              <exclude>src/test/resources/passwords.jceks</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
+              <exclude>src/test/resources/org/apache/accumulo/core/file/rfile/*.rf</exclude>
+              <exclude>src/test/resources/*.jceks</exclude>
             </excludes>
           </configuration>
         </plugin>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/examples/simple/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml
index 15e9951..2dd75eb 100644
--- a/examples/simple/pom.xml
+++ b/examples/simple/pom.xml
@@ -89,18 +89,6 @@
             <skip>true</skip>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <configuration>
-            <excludes>
-              <exclude>src/main/resources/META-INF/services/org.apache.accumulo.core.util.shell.ShellExtension</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6b29f4c..3027270 100644
--- a/pom.xml
+++ b/pom.xml
@@ -753,7 +753,8 @@
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
           <configuration>
-            <excludes>
+            <excludes combine.children="append">
+              <exclude>src/main/resources/META-INF/services/*</exclude>
               <exclude>nbproject/**</exclude>
               <exclude>nb-configuration.xml</exclude>
               <exclude>nbactions.xml</exclude>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/server/monitor/pom.xml
----------------------------------------------------------------------
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index 09df0e8..782085a 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -134,9 +134,6 @@
           <configuration>
             <excludes>
               <exclude>src/main/resources/web/flot/**/*.js</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
             </excludes>
           </configuration>
         </plugin>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/server/tserver/pom.xml
----------------------------------------------------------------------
diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml
index fc1c9fb..56366b5 100644
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@ -117,9 +117,6 @@
             <excludes>
               <exclude>src/test/resources/*.walog</exclude>
               <exclude>src/test/resources/walog-from-14/*</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
             </excludes>
           </configuration>
         </plugin>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 4f56790..e3cba7e 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -183,9 +183,6 @@
             <excludes>
               <exclude>system/bench/lib/*splits</exclude>
               <exclude>system/continuous/*.txt</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
             </excludes>
           </configuration>
         </plugin>


[07/18] accumulo git commit: ACCUMULO-4384 Simplify rat excludes

Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/src/main/resources/LICENSE
----------------------------------------------------------------------
diff --git a/assemble/src/main/resources/LICENSE b/assemble/src/main/resources/LICENSE
new file mode 100644
index 0000000..9cfab86
--- /dev/null
+++ b/assemble/src/main/resources/LICENSE
@@ -0,0 +1,883 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+**********
+
+APACHE ACCUMULO SUBCOMPONENTS:
+
+The Apache Accumulo project contains subcomponents with separate copyright
+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 includes software from the European Commission project OneLab:
+
+* BloomFilter.java
+* DynamicBloomFilter.java
+* Filter.java
+
+    Copyright (c) 2005, European Commission project OneLab under contract 034819
+    (http://www.one-lab.org)
+
+    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 the University Catholique de Louvain - UCL
+       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.
+
+**********
+
+This product includes JQuery:
+
+    Copyright 2011, John Resig
+    Dual licensed under the MIT or GPL Version 2 licenses.
+    http://jquery.org/license
+
+    Includes Sizzle.js
+    http://sizzlejs.com/
+    Copyright 2011, The Dojo Foundation
+    Released under the MIT, BSD, and GPL Licenses.
+
+    Distributed under the MIT License:
+
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use,
+    copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following
+    conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    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 includes Flot:
+
+    Copyright (c) 2007-2009 IOLA and Ole Laursen
+
+    Available under the MIT License (see above)
+
+    Flot bundles additional works:
+
+    jquery.pie.js
+    * Created by Brian Medendorp, June 2009
+    * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+
+    jquery.flot.resize.js
+    * Inline dependency:
+     * jQuery resize event - v1.1 - 3/14/2010
+     * http://benalman.com/projects/jquery-resize-plugin/
+     *
+     * Copyright (c) 2010 "Cowboy" Ben Alman
+     * Dual licensed under the MIT and GPL licenses.
+     * http://benalman.com/about/license/
+
+    distributed under the MIT license (see above)
+
+**********
+
+This product includes jline:
+
+    The BSD License
+
+    Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>
+    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 JLine 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.
+
+**********
+
+This product includes Apache Commons Math:
+
+    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
+    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
+    THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE
+    OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY
+    OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR
+    USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF
+    THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4)
+    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,
+    INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF
+    ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF
+    PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER
+    SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT
+    (INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE,
+    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:
+
+
+    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.
+
+    - 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.
+    ===============================================================================
+
+    Copyright and license statement for the original Mersenne twister C
+    routines translated in MersenneTwister class in package
+    org.apache.commons.math.random:
+
+       Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+       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
+            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.
+
+
+**********
+
+This product includes slf4j:
+
+    Copyright (c) 2004-2013 QOS.ch
+    All rights reserved.
+
+    Permission is hereby granted, free  of charge, to any person obtaining
+    a  copy  of this  software  and  associated  documentation files  (the
+    "Software"), to  deal in  the Software without  restriction, including
+    without limitation  the rights to  use, copy, modify,  merge, publish,
+    distribute,  sublicense, and/or sell  copies of  the Software,  and to
+    permit persons to whom the Software  is furnished to do so, subject to
+    the following conditions:
+
+    The  above  copyright  notice  and  this permission  notice  shall  be
+    included in all copies or substantial portions of the Software.
+
+    THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+    EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+    MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 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 includes javax.servlet-api (http://servlet-spec.java.net):
+
+  COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+  1. Definitions.
+
+     1.1. Contributor. means each individual or entity that creates or
+     contributes to the creation of Modifications.
+
+     1.2. Contributor Version. means the combination of the Original Software,
+     prior Modifications used by a Contributor (if any), and the Modifications
+     made by that particular Contributor.
+
+     1.3. Covered Software. means (a) the Original Software, or (b)
+     Modifications, or (c) the combination of files containing Original Software
+     with files containing Modifications, in each case including portions thereof.
+
+     1.4. Executable. means the Covered Software in any form other than Source
+     Code.
+
+     1.5. Initial Developer. means the individual or entity that first makes
+     Original Software available under this License.
+
+     1.6. Larger Work. means a work which combines Covered Software or portions
+     thereof with code not governed by the terms of this License.
+
+     1.7. License. means this document.
+
+     1.8. Licensable. means having the right to grant, to the maximum extent
+     possible, whether at the time of the initial grant or subsequently
+     acquired, any and all of the rights conveyed herein.
+
+     1.9. Modifications. means the Source Code and Executable form of any of the
+     following:
+
+          A. Any file that results from an addition to, deletion from or
+          modification of the contents of a file containing Original Software or
+          previous Modifications;
+
+          B. Any new file that contains any part of the Original Software or
+          previous Modification; or
+
+          C. Any new file that is contributed or otherwise made available under
+          the terms of this License.
+
+     1.10. Original Software. means the Source Code and Executable form of
+     computer software code that is originally released under this License.
+
+     1.11. Patent Claims. means any patent claim(s), now owned or hereafter
+     acquired, including without limitation, method, process, and apparatus
+     claims, in any patent Licensable by grantor.
+
+     1.12. Source Code. means (a) the common form of computer software code in
+     which modifications are made and (b) associated documentation included in
+     or with such code.
+
+     1.13. You. (or .Your.) means an individual or a legal entity exercising
+     rights under, and complying with all of the terms of, this License. For
+     legal entities, .You. includes any entity which controls, is controlled by,
+     or is under common control with You. For purposes of this definition,
+     .control. means (a) the power, direct or indirect, to cause the direction
+     or management of such entity, whether by contract or otherwise, or (b)
+     ownership of more than fifty percent (50%) of the outstanding shares or
+     beneficial ownership of such entity.
+
+  2. License Grants.
+
+        2.1. The Initial Developer Grant.
+
+        Conditioned upon Your compliance with Section 3.1 below and subject to
+        third party intellectual property claims, the Initial Developer hereby
+        grants You a world-wide, royalty-free, non-exclusive license:
+
+           (a) under intellectual property rights (other than patent or
+           trademark) Licensable by Initial Developer, to use, reproduce,
+           modify, display, perform, sublicense and distribute the Original
+           Software (or portions thereof), with or without Modifications, and/or
+           as part of a Larger Work; and
+
+           (b) under Patent Claims infringed by the making, using or selling of
+           Original Software, to make, have made, use, practice, sell, and offer
+           for sale, and/or otherwise dispose of the Original Software (or
+           portions thereof).
+
+          (c) The licenses granted in Sections 2.1(a) and (b) are effective on
+          the date Initial Developer first distributes or otherwise makes the
+          Original Software available to a third party under the terms of this
+          License.
+
+          (d) Notwithstanding Section 2.1(b) above, no patent license is
+          granted: (1) for code that You delete from the Original Software, or
+          (2) for infringements caused by: (i) the modification of the Original
+          Software, or (ii) the combination of the Original Software with other
+          software or devices.
+
+      2.2. Contributor Grant.
+
+      Conditioned upon Your compliance with Section 3.1 below and subject to
+      third party intellectual property claims, each Contributor hereby grants
+      You a world-wide, royalty-free, non-exclusive license:
+
+          (a) under intellectual property rights (other than patent or
+          trademark) Licensable by Contributor to use, reproduce, modify,
+          display, perform, sublicense and distribute the Modifications created
+          by such Contributor (or portions thereof), either on an unmodified
+          basis, with other Modifications, as Covered Software and/or as part of
+          a Larger Work; and
+
+          (b) under Patent Claims infringed by the making, using, or selling of
+          Modifications made by that Contributor either alone and/or in
+          combination with its Contributor Version (or portions of such
+          combination), to make, use, sell, offer for sale, have made,
+          and/or otherwise dispose of: (1) Modifications made by that
+          Contributor (or portions thereof); and (2) the combination of
+          Modifications made by that Contributor with its Contributor Version
+          (or portions of such combination).
+
+          (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
+          on the date Contributor first distributes or otherwise makes the
+          Modifications available to a third party.
+
+          (d) Notwithstanding Section 2.2(b) above, no patent license is
+          granted: (1) for any code that Contributor has deleted from the
+          Contributor Version; (2) for infringements caused by: (i) third party
+          modifications of Contributor Version, or (ii) the combination of
+          Modifications made by that Contributor with other software (except as
+          part of the Contributor Version) or other devices; or (3) under
+          Patent Claims infringed by Covered Software in the absence of
+          Modifications made by that Contributor.
+
+  3. Distribution Obligations.
+
+        3.1. Availability of Source Code.  Any Covered Software that You
+        distribute or otherwise make available in Executable form must also be
+        made available in Source Code form and that Source Code form must be
+        distributed only under the terms of this License. You must include a
+        copy of this License with every copy of the Source Code form of the
+        Covered Software You distribute or otherwise make available. You must
+        inform recipients of any such Covered Software in Executable form as to
+        how they can obtain such Covered Software in Source Code form in a
+        reasonable manner on or through a medium customarily used for software
+        exchange.
+
+        3.2. Modifications.  The Modifications that You create or to which You
+        contribute are governed by the terms of this License. You represent that
+        You believe Your Modifications are Your original creation(s) and/or You
+        have sufficient rights to grant the rights conveyed by this License.
+
+        3.3. Required Notices.  You must include a notice in each of Your
+        Modifications that identifies You as the Contributor of the
+        Modification. You may not remove or alter any copyright, patent or
+        trademark notices contained within the Covered Software, or any notices
+        of licensing or any descriptive text giving attribution to any
+        Contributor or the Initial Developer.
+
+        3.4. Application of Additional Terms.  You may not offer or impose any
+        terms on any Covered Software in Source Code form that alters or
+        restricts the applicable version of this License or the recipients.
+        rights hereunder.  You may choose to offer, and to charge a fee for,
+        warranty, support, indemnity or liability obligations to one or more
+        recipients of Covered Software. However, you may do so only on Your own
+        behalf, and not on behalf of the Initial Developer or any Contributor.
+        You must make it absolutely clear that any such warranty, support,
+        indemnity or liability obligation is offered by You alone, and You
+        hereby agree to indemnify the Initial Developer and every Contributor
+        for any liability incurred by the Initial Developer or such Contributor
+        as a result of warranty, support, indemnity or liability terms You
+        offer.
+
+        3.5. Distribution of Executable Versions.  You may distribute the
+        Executable form of the Covered Software under the terms of this License
+        or under the terms of a license of Your choice, which may contain terms
+        different from this License, provided that You are in compliance with
+        the terms of this License and that the license for the Executable form
+        does not attempt to limit or alter the recipient.s rights in the Source
+        Code form from the rights set forth in this License. If You distribute
+        the Covered Software in Executable form under a different license, You
+        must make it absolutely clear that any terms which differ from this
+        License are offered by You alone, not by the Initial Developer or
+        Contributor. You hereby agree to indemnify the Initial Developer and
+        every Contributor for any liability incurred by the Initial Developer or
+        such Contributor as a result of any such terms You offer.
+
+        3.6. Larger Works.  You may create a Larger Work by combining Covered
+        Software with other code not governed by the terms of this License and
+        distribute the Larger Work as a single product. In such a case, You must
+        make sure the requirements of this License are fulfilled for the Covered
+        Software.
+
+  4. Versions of the License.
+
+        4.1. New Versions.  Sun Microsystems, Inc. is the initial license
+        steward and may publish revised and/or new versions of this License from
+        time to time. Each version will be given a distinguishing version
+        number. Except as provided in Section 4.3, no one other than the license
+        steward has the right to modify this License.
+
+        4.2. Effect of New Versions.  You may always continue to use, distribute
+        or otherwise make the Covered Software available under the terms of the
+        version of the License under which You originally received the Covered
+        Software. If the Initial Developer includes a notice in the Original
+        Software prohibiting it from being distributed or otherwise made
+        available under any subsequent version of the License, You must
+        distribute and make the Covered Software available under the terms of
+        the version of the License under which You originally received the
+        Covered Software. Otherwise, You may also choose to use, distribute or
+        otherwise make the Covered Software available under the terms of any
+        subsequent version of the License published by the license steward.
+
+        4.3. Modified Versions.  When You are an Initial Developer and You want
+        to create a new license for Your Original Software, You may create and
+        use a modified version of this License if You: (a) rename the license
+        and remove any references to the name of the license steward (except to
+        note that the license differs from this License); and (b) otherwise
+        make it clear that the license contains terms which differ from this
+        License.
+
+  5. DISCLAIMER OF WARRANTY.
+
+     COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE
+     ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS
+     WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU
+     (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
+     NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY
+     CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
+     SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+  6. TERMINATION.
+
+        6.1. This License and the rights granted hereunder will terminate
+        automatically if You fail to comply with terms herein and fail to cure
+        such breach within 30 days of becoming aware of the breach. Provisions
+        which, by their nature, must remain in effect beyond the termination of
+        this License shall survive.
+
+        6.2. If You assert a patent infringement claim (excluding declaratory
+        judgment actions) against Initial Developer or a Contributor (the
+        Initial Developer or Contributor against whom You assert such
+        claim is referred to as .Participant.) alleging that the
+        Participant Software (meaning the Contributor Version where the
+        Participant is a Contributor or the Original Software where the
+        Participant is the Initial Developer) directly or indirectly
+        infringes any patent, then any and all rights granted directly or
+        indirectly to You by such Participant, the Initial Developer (if the
+        Initial Developer is not the Participant) and all Contributors
+        under Sections 2.1 and/or 2.2 of this License shall, upon 60 days
+        notice from Participant terminate prospectively and automatically at
+        the expiration of such 60 day notice period, unless if within such
+        60 day period You withdraw Your claim with respect to the
+        Participant Software against such Participant either unilaterally or
+        pursuant to a written agreement with Participant.
+
+        6.3. In the event of termination under Sections 6.1 or 6.2 above, all
+        end user licenses that have been validly granted by You or any
+        distributor hereunder prior to termination (excluding licenses granted
+        to You by any distributor) shall survive termination.
+
+  7. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
+     NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER,
+     ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY
+     SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT,
+     SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING,
+     WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
+     STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL
+     DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
+     POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY
+     TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY.S
+     NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME
+     JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+     CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
+     YOU.
+
+  8. U.S. GOVERNMENT END USERS.
+
+     The Covered Software is a .commercial item,. as that term is defined in 48
+     C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as
+     that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and .commercial
+     computer software documentation. as such terms are used in 48 C.F.R. 12.212
+     (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+     through 227.7202-4 (June 1995), all U.S. Government End Users acquire
+     Covered Software with only those rights set forth herein. This U.S.
+     Government Rights clause is in lieu of, and supersedes, any other FAR,
+     DFAR, or other clause or provision that addresses Government rights in
+     computer software under this License.
+
+  9. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject matter
+     hereof. If any provision of this License is held to be unenforceable, such
+     provision shall be reformed only to the extent necessary to make it
+     enforceable.  This License shall be governed by the law of the jurisdiction
+     specified in a notice contained within the Original Software (except to the
+     extent applicable law, if any, provides otherwise), excluding such
+     jurisdiction.s conflict-of-law provisions. Any litigation relating to this
+     License shall be subject to the jurisdiction of the courts located in the
+     jurisdiction and venue specified in a notice contained within the Original
+     Software, with the losing party responsible for costs, including, without
+     limitation, court costs and reasonable attorneys. fees and expenses. The
+     application of the United Nations Convention on Contracts for the
+     International Sale of Goods is expressly excluded. Any law or regulation
+     which provides that the language of a contract shall be construed against
+     the drafter shall not apply to this License. You agree that You alone are
+     responsible for compliance with the United States export administration
+     regulations (and the export control laws and regulation of any other countries)
+     when You use, distribute or otherwise make available any Covered Software.
+
+  10. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is
+     responsible for claims and damages arising, directly or indirectly, out of
+     its utilization of rights under this License and You agree to work with
+     Initial Developer and Contributors to distribute such responsibility on an
+     equitable basis. Nothing herein is intended or shall be deemed to
+     constitute any admission of liability.
+
+     NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
+     LICENSE (CDDL)
+
+     The code released under the CDDL shall be governed by the laws of the State
+     of California (excluding conflict-of-law provisions). Any litigation
+     relating to this License shall be subject to the jurisdiction of the
+     Federal Courts of the Northern District of California and the state courts
+     of the State of California, with venue lying in Santa Clara County,
+     California.
+
+**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/assemble/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/assemble/src/main/resources/NOTICE b/assemble/src/main/resources/NOTICE
new file mode 100644
index 0000000..f6370f2
--- /dev/null
+++ b/assemble/src/main/resources/NOTICE
@@ -0,0 +1,61 @@
+Apache Accumulo
+Copyright 2011-2016 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+**********
+
+This product includes JCommander (https://github.com/cbeust/jcommander),
+Copyright 2010 Cedric Beust cedric@beust.com.
+
+**********
+
+This product includes Apache Commons Math (https://commons.apache.org/proper/commons-math/).
+Copyright 2001-2010 The Apache Software Foundation
+
+From commons-math NOTICE.txt:
+
+    ===============================================================================
+    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
+    ===============================================================================
+
+    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.
+    ===============================================================================
+
+    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 Jetty (http://eclipse.org/jetty)
+Copyright 1996-2009 Mort Bay Consulting Pty. Ltd.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 30468da..b701d8a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -166,16 +166,8 @@
           <configuration>
             <excludes>
               <exclude>src/test/resources/shelltest.txt</exclude>
-              <exclude>src/test/resources/org/apache/accumulo/core/file/rfile/ver_3.rf</exclude>
-              <exclude>src/test/resources/org/apache/accumulo/core/file/rfile/ver_4.rf</exclude>
-              <exclude>src/test/resources/org/apache/accumulo/core/file/rfile/ver_6.rf</exclude>
-              <exclude>src/test/resources/site-cfg.jceks</exclude>
-              <exclude>src/test/resources/accumulo.jceks</exclude>
-              <exclude>src/test/resources/empty.jceks</exclude>
-              <exclude>src/test/resources/passwords.jceks</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
+              <exclude>src/test/resources/org/apache/accumulo/core/file/rfile/*.rf</exclude>
+              <exclude>src/test/resources/*.jceks</exclude>
             </excludes>
           </configuration>
         </plugin>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/examples/simple/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml
index 15e9951..2dd75eb 100644
--- a/examples/simple/pom.xml
+++ b/examples/simple/pom.xml
@@ -89,18 +89,6 @@
             <skip>true</skip>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <configuration>
-            <excludes>
-              <exclude>src/main/resources/META-INF/services/org.apache.accumulo.core.util.shell.ShellExtension</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6b29f4c..3027270 100644
--- a/pom.xml
+++ b/pom.xml
@@ -753,7 +753,8 @@
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
           <configuration>
-            <excludes>
+            <excludes combine.children="append">
+              <exclude>src/main/resources/META-INF/services/*</exclude>
               <exclude>nbproject/**</exclude>
               <exclude>nb-configuration.xml</exclude>
               <exclude>nbactions.xml</exclude>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/server/monitor/pom.xml
----------------------------------------------------------------------
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index 09df0e8..782085a 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -134,9 +134,6 @@
           <configuration>
             <excludes>
               <exclude>src/main/resources/web/flot/**/*.js</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
             </excludes>
           </configuration>
         </plugin>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/server/tserver/pom.xml
----------------------------------------------------------------------
diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml
index fc1c9fb..56366b5 100644
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@ -117,9 +117,6 @@
             <excludes>
               <exclude>src/test/resources/*.walog</exclude>
               <exclude>src/test/resources/walog-from-14/*</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
             </excludes>
           </configuration>
         </plugin>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0fdd52a7/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 4f56790..e3cba7e 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -183,9 +183,6 @@
             <excludes>
               <exclude>system/bench/lib/*splits</exclude>
               <exclude>system/continuous/*.txt</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
             </excludes>
           </configuration>
         </plugin>


[17/18] accumulo git commit: Merge branch '1.7' into 1.8

Posted by ct...@apache.org.
Merge branch '1.7' into 1.8


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/394ad086
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/394ad086
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/394ad086

Branch: refs/heads/master
Commit: 394ad0864ca931a2feea34677084b8c8332c73db
Parents: 7a47b18 f6465ac
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Jul 21 18:43:29 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jul 21 18:43:29 2016 -0400

----------------------------------------------------------------------
 LICENSE                                         | 109 +-
 NOTICE                                          |   7 -
 assemble/bin-LICENSE                            | 989 -------------------
 assemble/bin-NOTICE                             |  18 -
 assemble/pom.xml                                |  17 -
 assemble/src/main/assemblies/component.xml      |  22 +-
 assemble/src/main/resources/LICENSE             | 982 ++++++++++++++++++
 assemble/src/main/resources/NOTICE              |  23 +
 core/pom.xml                                    |  13 +-
 .../main/appended-resources/META-INF/LICENSE    |  71 +-
 examples/simple/pom.xml                         |  12 -
 pom.xml                                         |   3 +-
 server/base/pom.xml                             |  29 -
 .../src/main/appended-resources/META-INF/NOTICE |   9 -
 server/base/src/main/javadoc/META-INF/LICENSE   | 202 ----
 server/base/src/main/javadoc/META-INF/NOTICE    |   5 -
 server/monitor/pom.xml                          |   3 -
 .../main/appended-resources/META-INF/LICENSE    | 100 +-
 server/monitor/src/main/javadoc/META-INF/NOTICE |   5 -
 server/native/src/main/resources/LICENSE        |   1 -
 server/native/src/main/resources/NOTICE         |   2 +-
 server/tserver/pom.xml                          |  32 -
 shell/pom.xml                                   |  17 -
 test/pom.xml                                    |   3 -
 24 files changed, 1165 insertions(+), 1509 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/394ad086/assemble/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/394ad086/assemble/src/main/assemblies/component.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/394ad086/assemble/src/main/resources/LICENSE
----------------------------------------------------------------------
diff --cc assemble/src/main/resources/LICENSE
index 0000000,9ba98fd..7b7568a
mode 000000,100644..100644
--- a/assemble/src/main/resources/LICENSE
+++ b/assemble/src/main/resources/LICENSE
@@@ -1,0 -1,921 +1,982 @@@
+ 
+                                  Apache License
+                            Version 2.0, January 2004
+                         http://www.apache.org/licenses/
+ 
+    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ 
+    1. Definitions.
+ 
+       "License" shall mean the terms and conditions for use, reproduction,
+       and distribution as defined by Sections 1 through 9 of this document.
+ 
+       "Licensor" shall mean the copyright owner or entity authorized by
+       the copyright owner that is granting the License.
+ 
+       "Legal Entity" shall mean the union of the acting entity and all
+       other entities that control, are controlled by, or are under common
+       control with that entity. For the purposes of this definition,
+       "control" means (i) the power, direct or indirect, to cause the
+       direction or management of such entity, whether by contract or
+       otherwise, or (ii) ownership of fifty percent (50%) or more of the
+       outstanding shares, or (iii) beneficial ownership of such entity.
+ 
+       "You" (or "Your") shall mean an individual or Legal Entity
+       exercising permissions granted by this License.
+ 
+       "Source" form shall mean the preferred form for making modifications,
+       including but not limited to software source code, documentation
+       source, and configuration files.
+ 
+       "Object" form shall mean any form resulting from mechanical
+       transformation or translation of a Source form, including but
+       not limited to compiled object code, generated documentation,
+       and conversions to other media types.
+ 
+       "Work" shall mean the work of authorship, whether in Source or
+       Object form, made available under the License, as indicated by a
+       copyright notice that is included in or attached to the work
+       (an example is provided in the Appendix below).
+ 
+       "Derivative Works" shall mean any work, whether in Source or Object
+       form, that is based on (or derived from) the Work and for which the
+       editorial revisions, annotations, elaborations, or other modifications
+       represent, as a whole, an original work of authorship. For the purposes
+       of this License, Derivative Works shall not include works that remain
+       separable from, or merely link (or bind by name) to the interfaces of,
+       the Work and Derivative Works thereof.
+ 
+       "Contribution" shall mean any work of authorship, including
+       the original version of the Work and any modifications or additions
+       to that Work or Derivative Works thereof, that is intentionally
+       submitted to Licensor for inclusion in the Work by the copyright owner
+       or by an individual or Legal Entity authorized to submit on behalf of
+       the copyright owner. For the purposes of this definition, "submitted"
+       means any form of electronic, verbal, or written communication sent
+       to the Licensor or its representatives, including but not limited to
+       communication on electronic mailing lists, source code control systems,
+       and issue tracking systems that are managed by, or on behalf of, the
+       Licensor for the purpose of discussing and improving the Work, but
+       excluding communication that is conspicuously marked or otherwise
+       designated in writing by the copyright owner as "Not a Contribution."
+ 
+       "Contributor" shall mean Licensor and any individual or Legal Entity
+       on behalf of whom a Contribution has been received by Licensor and
+       subsequently incorporated within the Work.
+ 
+    2. Grant of Copyright License. Subject to the terms and conditions of
+       this License, each Contributor hereby grants to You a perpetual,
+       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+       copyright license to reproduce, prepare Derivative Works of,
+       publicly display, publicly perform, sublicense, and distribute the
+       Work and such Derivative Works in Source or Object form.
+ 
+    3. Grant of Patent License. Subject to the terms and conditions of
+       this License, each Contributor hereby grants to You a perpetual,
+       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+       (except as stated in this section) patent license to make, have made,
+       use, offer to sell, sell, import, and otherwise transfer the Work,
+       where such license applies only to those patent claims licensable
+       by such Contributor that are necessarily infringed by their
+       Contribution(s) alone or by combination of their Contribution(s)
+       with the Work to which such Contribution(s) was submitted. If You
+       institute patent litigation against any entity (including a
+       cross-claim or counterclaim in a lawsuit) alleging that the Work
+       or a Contribution incorporated within the Work constitutes direct
+       or contributory patent infringement, then any patent licenses
+       granted to You under this License for that Work shall terminate
+       as of the date such litigation is filed.
+ 
+    4. Redistribution. You may reproduce and distribute copies of the
+       Work or Derivative Works thereof in any medium, with or without
+       modifications, and in Source or Object form, provided that You
+       meet the following conditions:
+ 
+       (a) You must give any other recipients of the Work or
+           Derivative Works a copy of this License; and
+ 
+       (b) You must cause any modified files to carry prominent notices
+           stating that You changed the files; and
+ 
+       (c) You must retain, in the Source form of any Derivative Works
+           that You distribute, all copyright, patent, trademark, and
+           attribution notices from the Source form of the Work,
+           excluding those notices that do not pertain to any part of
+           the Derivative Works; and
+ 
+       (d) If the Work includes a "NOTICE" text file as part of its
+           distribution, then any Derivative Works that You distribute must
+           include a readable copy of the attribution notices contained
+           within such NOTICE file, excluding those notices that do not
+           pertain to any part of the Derivative Works, in at least one
+           of the following places: within a NOTICE text file distributed
+           as part of the Derivative Works; within the Source form or
+           documentation, if provided along with the Derivative Works; or,
+           within a display generated by the Derivative Works, if and
+           wherever such third-party notices normally appear. The contents
+           of the NOTICE file are for informational purposes only and
+           do not modify the License. You may add Your own attribution
+           notices within Derivative Works that You distribute, alongside
+           or as an addendum to the NOTICE text from the Work, provided
+           that such additional attribution notices cannot be construed
+           as modifying the License.
+ 
+       You may add Your own copyright statement to Your modifications and
+       may provide additional or different license terms and conditions
+       for use, reproduction, or distribution of Your modifications, or
+       for any such Derivative Works as a whole, provided Your use,
+       reproduction, and distribution of the Work otherwise complies with
+       the conditions stated in this License.
+ 
+    5. Submission of Contributions. Unless You explicitly state otherwise,
+       any Contribution intentionally submitted for inclusion in the Work
+       by You to the Licensor shall be under the terms and conditions of
+       this License, without any additional terms or conditions.
+       Notwithstanding the above, nothing herein shall supersede or modify
+       the terms of any separate license agreement you may have executed
+       with Licensor regarding such Contributions.
+ 
+    6. Trademarks. This License does not grant permission to use the trade
+       names, trademarks, service marks, or product names of the Licensor,
+       except as required for reasonable and customary use in describing the
+       origin of the Work and reproducing the content of the NOTICE file.
+ 
+    7. Disclaimer of Warranty. Unless required by applicable law or
+       agreed to in writing, Licensor provides the Work (and each
+       Contributor provides its Contributions) on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied, including, without limitation, any warranties or conditions
+       of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+       PARTICULAR PURPOSE. You are solely responsible for determining the
+       appropriateness of using or redistributing the Work and assume any
+       risks associated with Your exercise of permissions under this License.
+ 
+    8. Limitation of Liability. In no event and under no legal theory,
+       whether in tort (including negligence), contract, or otherwise,
+       unless required by applicable law (such as deliberate and grossly
+       negligent acts) or agreed to in writing, shall any Contributor be
+       liable to You for damages, including any direct, indirect, special,
+       incidental, or consequential damages of any character arising as a
+       result of this License or out of the use or inability to use the
+       Work (including but not limited to damages for loss of goodwill,
+       work stoppage, computer failure or malfunction, or any and all
+       other commercial damages or losses), even if such Contributor
+       has been advised of the possibility of such damages.
+ 
+    9. Accepting Warranty or Additional Liability. While redistributing
+       the Work or Derivative Works thereof, You may choose to offer,
+       and charge a fee for, acceptance of support, warranty, indemnity,
+       or other liability obligations and/or rights consistent with this
+       License. However, in accepting such obligations, You may act only
+       on Your own behalf and on Your sole responsibility, not on behalf
+       of any other Contributor, and only if You agree to indemnify,
+       defend, and hold each Contributor harmless for any liability
+       incurred by, or claims asserted against, such Contributor by reason
+       of your accepting any such warranty or additional liability.
+ 
+    END OF TERMS AND CONDITIONS
+ 
+    APPENDIX: How to apply the Apache License to your work.
+ 
+       To apply the Apache License to your work, attach the following
+       boilerplate notice, with the fields enclosed by brackets "[]"
+       replaced with your own identifying information. (Don't include
+       the brackets!)  The text should be enclosed in the appropriate
+       comment syntax for the file format. We also recommend that a
+       file or class name and description of purpose be included on the
+       same "printed page" as the copyright notice for easier
+       identification within third-party archives.
+ 
+    Copyright [yyyy] [name of copyright owner]
+ 
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+ 
+        http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+ 
+ **********
+ 
+ APACHE ACCUMULO SUBCOMPONENTS:
+ 
+ The Apache Accumulo project contains subcomponents with separate copyright
+ 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 includes software from the European Commission project OneLab:
+ 
+ * BloomFilter.java
+ * DynamicBloomFilter.java
+ * Filter.java
+ 
+     Copyright (c) 2005, European Commission project OneLab under contract 034819
+     (http://www.one-lab.org)
+ 
+     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 the University Catholique de Louvain - UCL
+        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.
+ 
+ **********
+ 
+ This product includes JQuery:
+ 
+     Copyright 2011, John Resig
+     Dual licensed under the MIT or GPL Version 2 licenses.
+     http://jquery.org/license
+ 
+     Includes Sizzle.js
+     http://sizzlejs.com/
+     Copyright 2011, The Dojo Foundation
+     Released under the MIT, BSD, and GPL Licenses.
+ 
+     Distributed under the MIT License:
+ 
+     Permission is hereby granted, free of charge, to any person
+     obtaining a copy of this software and associated documentation
+     files (the "Software"), to deal in the Software without
+     restriction, including without limitation the rights to use,
+     copy, modify, merge, publish, distribute, sublicense, and/or sell
+     copies of the Software, and to permit persons to whom the
+     Software is furnished to do so, subject to the following
+     conditions:
+ 
+     The above copyright notice and this permission notice shall be
+     included in all copies or substantial portions of the Software.
+ 
+     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+     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 includes Flot:
+ 
+     Copyright (c) 2007-2009 IOLA and Ole Laursen
+ 
+     Available under the MIT License (see above)
+ 
+     Flot bundles additional works:
+ 
+     jquery.pie.js
+     * Created by Brian Medendorp, June 2009
+     * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+ 
+     jquery.flot.resize.js
+     * Inline dependency:
+      * jQuery resize event - v1.1 - 3/14/2010
+      * http://benalman.com/projects/jquery-resize-plugin/
+      *
+      * Copyright (c) 2010 "Cowboy" Ben Alman
+      * Dual licensed under the MIT and GPL licenses.
+      * http://benalman.com/about/license/
+ 
+     distributed under the MIT license (see above)
+ 
+ **********
+ 
+ This product includes jline:
+ 
+     The BSD License
+ 
+     Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>
+     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 JLine 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.
+ 
+ **********
+ 
 -This product includes Apache Commons Math:
++This product includes Apache Commons Math3:
++
++    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
+     THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR
+     IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES
+     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE
+     OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY
+     OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR
+     USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF
+     THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4)
+     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,
+     INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF
+     ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF
+     PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER
+     SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT
+     (INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE,
+     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.
 -
 -    - 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.
 -    ===============================================================================
 -
+     Copyright and license statement for the original Mersenne twister C
+     routines translated in MersenneTwister class in package
 -    org.apache.commons.math.random:
++    org.apache.commons.math3.random:
+ 
+        Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+        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
+             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.
+ 
++    ===============================================================================
++
++    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.
++
++    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 \u201cAS IS\u201d 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 includes Protocol Buffers:
+ 
+     Copyright 2014, Google Inc. 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 Google Inc. 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.
+ 
+     Code generated by the Protocol Buffer compiler is owned by the owner
+     of the input file used when generating it. This code is not
+     standalone and requires a support library to be linked with it. This
+     support library is itself covered by the above license.
+ 
+ **********
+ 
+ This product includes slf4j:
+ 
+     Copyright (c) 2004-2013 QOS.ch
+     All rights reserved.
+ 
+     Permission is hereby granted, free  of charge, to any person obtaining
+     a  copy  of this  software  and  associated  documentation files  (the
+     "Software"), to  deal in  the Software without  restriction, including
+     without limitation  the rights to  use, copy, modify,  merge, publish,
+     distribute,  sublicense, and/or sell  copies of  the Software,  and to
+     permit persons to whom the Software  is furnished to do so, subject to
+     the following conditions:
+ 
+     The  above  copyright  notice  and  this permission  notice  shall  be
+     included in all copies or substantial portions of the Software.
+ 
+     THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+     EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+     MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+     LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 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 includes javax.servlet-api (http://servlet-spec.java.net):
+ 
+   COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+ 
+   1. Definitions.
+ 
+      1.1. Contributor. means each individual or entity that creates or
+      contributes to the creation of Modifications.
+ 
+      1.2. Contributor Version. means the combination of the Original Software,
+      prior Modifications used by a Contributor (if any), and the Modifications
+      made by that particular Contributor.
+ 
+      1.3. Covered Software. means (a) the Original Software, or (b)
+      Modifications, or (c) the combination of files containing Original Software
+      with files containing Modifications, in each case including portions thereof.
+ 
+      1.4. Executable. means the Covered Software in any form other than Source
+      Code.
+ 
+      1.5. Initial Developer. means the individual or entity that first makes
+      Original Software available under this License.
+ 
+      1.6. Larger Work. means a work which combines Covered Software or portions
+      thereof with code not governed by the terms of this License.
+ 
+      1.7. License. means this document.
+ 
+      1.8. Licensable. means having the right to grant, to the maximum extent
+      possible, whether at the time of the initial grant or subsequently
+      acquired, any and all of the rights conveyed herein.
+ 
+      1.9. Modifications. means the Source Code and Executable form of any of the
+      following:
+ 
+           A. Any file that results from an addition to, deletion from or
+           modification of the contents of a file containing Original Software or
+           previous Modifications;
+ 
+           B. Any new file that contains any part of the Original Software or
+           previous Modification; or
+ 
+           C. Any new file that is contributed or otherwise made available under
+           the terms of this License.
+ 
+      1.10. Original Software. means the Source Code and Executable form of
+      computer software code that is originally released under this License.
+ 
+      1.11. Patent Claims. means any patent claim(s), now owned or hereafter
+      acquired, including without limitation, method, process, and apparatus
+      claims, in any patent Licensable by grantor.
+ 
+      1.12. Source Code. means (a) the common form of computer software code in
+      which modifications are made and (b) associated documentation included in
+      or with such code.
+ 
+      1.13. You. (or .Your.) means an individual or a legal entity exercising
+      rights under, and complying with all of the terms of, this License. For
+      legal entities, .You. includes any entity which controls, is controlled by,
+      or is under common control with You. For purposes of this definition,
+      .control. means (a) the power, direct or indirect, to cause the direction
+      or management of such entity, whether by contract or otherwise, or (b)
+      ownership of more than fifty percent (50%) of the outstanding shares or
+      beneficial ownership of such entity.
+ 
+   2. License Grants.
+ 
+         2.1. The Initial Developer Grant.
+ 
+         Conditioned upon Your compliance with Section 3.1 below and subject to
+         third party intellectual property claims, the Initial Developer hereby
+         grants You a world-wide, royalty-free, non-exclusive license:
+ 
+            (a) under intellectual property rights (other than patent or
+            trademark) Licensable by Initial Developer, to use, reproduce,
+            modify, display, perform, sublicense and distribute the Original
+            Software (or portions thereof), with or without Modifications, and/or
+            as part of a Larger Work; and
+ 
+            (b) under Patent Claims infringed by the making, using or selling of
+            Original Software, to make, have made, use, practice, sell, and offer
+            for sale, and/or otherwise dispose of the Original Software (or
+            portions thereof).
+ 
+           (c) The licenses granted in Sections 2.1(a) and (b) are effective on
+           the date Initial Developer first distributes or otherwise makes the
+           Original Software available to a third party under the terms of this
+           License.
+ 
+           (d) Notwithstanding Section 2.1(b) above, no patent license is
+           granted: (1) for code that You delete from the Original Software, or
+           (2) for infringements caused by: (i) the modification of the Original
+           Software, or (ii) the combination of the Original Software with other
+           software or devices.
+ 
+       2.2. Contributor Grant.
+ 
+       Conditioned upon Your compliance with Section 3.1 below and subject to
+       third party intellectual property claims, each Contributor hereby grants
+       You a world-wide, royalty-free, non-exclusive license:
+ 
+           (a) under intellectual property rights (other than patent or
+           trademark) Licensable by Contributor to use, reproduce, modify,
+           display, perform, sublicense and distribute the Modifications created
+           by such Contributor (or portions thereof), either on an unmodified
+           basis, with other Modifications, as Covered Software and/or as part of
+           a Larger Work; and
+ 
+           (b) under Patent Claims infringed by the making, using, or selling of
+           Modifications made by that Contributor either alone and/or in
+           combination with its Contributor Version (or portions of such
+           combination), to make, use, sell, offer for sale, have made,
+           and/or otherwise dispose of: (1) Modifications made by that
+           Contributor (or portions thereof); and (2) the combination of
+           Modifications made by that Contributor with its Contributor Version
+           (or portions of such combination).
+ 
+           (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
+           on the date Contributor first distributes or otherwise makes the
+           Modifications available to a third party.
+ 
+           (d) Notwithstanding Section 2.2(b) above, no patent license is
+           granted: (1) for any code that Contributor has deleted from the
+           Contributor Version; (2) for infringements caused by: (i) third party
+           modifications of Contributor Version, or (ii) the combination of
+           Modifications made by that Contributor with other software (except as
+           part of the Contributor Version) or other devices; or (3) under
+           Patent Claims infringed by Covered Software in the absence of
+           Modifications made by that Contributor.
+ 
+   3. Distribution Obligations.
+ 
+         3.1. Availability of Source Code.  Any Covered Software that You
+         distribute or otherwise make available in Executable form must also be
+         made available in Source Code form and that Source Code form must be
+         distributed only under the terms of this License. You must include a
+         copy of this License with every copy of the Source Code form of the
+         Covered Software You distribute or otherwise make available. You must
+         inform recipients of any such Covered Software in Executable form as to
+         how they can obtain such Covered Software in Source Code form in a
+         reasonable manner on or through a medium customarily used for software
+         exchange.
+ 
+         3.2. Modifications.  The Modifications that You create or to which You
+         contribute are governed by the terms of this License. You represent that
+         You believe Your Modifications are Your original creation(s) and/or You
+         have sufficient rights to grant the rights conveyed by this License.
+ 
+         3.3. Required Notices.  You must include a notice in each of Your
+         Modifications that identifies You as the Contributor of the
+         Modification. You may not remove or alter any copyright, patent or
+         trademark notices contained within the Covered Software, or any notices
+         of licensing or any descriptive text giving attribution to any
+         Contributor or the Initial Developer.
+ 
+         3.4. Application of Additional Terms.  You may not offer or impose any
+         terms on any Covered Software in Source Code form that alters or
+         restricts the applicable version of this License or the recipients.
+         rights hereunder.  You may choose to offer, and to charge a fee for,
+         warranty, support, indemnity or liability obligations to one or more
+         recipients of Covered Software. However, you may do so only on Your own
+         behalf, and not on behalf of the Initial Developer or any Contributor.
+         You must make it absolutely clear that any such warranty, support,
+         indemnity or liability obligation is offered by You alone, and You
+         hereby agree to indemnify the Initial Developer and every Contributor
+         for any liability incurred by the Initial Developer or such Contributor
+         as a result of warranty, support, indemnity or liability terms You
+         offer.
+ 
+         3.5. Distribution of Executable Versions.  You may distribute the
+         Executable form of the Covered Software under the terms of this License
+         or under the terms of a license of Your choice, which may contain terms
+         different from this License, provided that You are in compliance with
+         the terms of this License and that the license for the Executable form
+         does not attempt to limit or alter the recipient.s rights in the Source
+         Code form from the rights set forth in this License. If You distribute
+         the Covered Software in Executable form under a different license, You
+         must make it absolutely clear that any terms which differ from this
+         License are offered by You alone, not by the Initial Developer or
+         Contributor. You hereby agree to indemnify the Initial Developer and
+         every Contributor for any liability incurred by the Initial Developer or
+         such Contributor as a result of any such terms You offer.
+ 
+         3.6. Larger Works.  You may create a Larger Work by combining Covered
+         Software with other code not governed by the terms of this License and
+         distribute the Larger Work as a single product. In such a case, You must
+         make sure the requirements of this License are fulfilled for the Covered
+         Software.
+ 
+   4. Versions of the License.
+ 
+         4.1. New Versions.  Sun Microsystems, Inc. is the initial license
+         steward and may publish revised and/or new versions of this License from
+         time to time. Each version will be given a distinguishing version
+         number. Except as provided in Section 4.3, no one other than the license
+         steward has the right to modify this License.
+ 
+         4.2. Effect of New Versions.  You may always continue to use, distribute
+         or otherwise make the Covered Software available under the terms of the
+         version of the License under which You originally received the Covered
+         Software. If the Initial Developer includes a notice in the Original
+         Software prohibiting it from being distributed or otherwise made
+         available under any subsequent version of the License, You must
+         distribute and make the Covered Software available under the terms of
+         the version of the License under which You originally received the
+         Covered Software. Otherwise, You may also choose to use, distribute or
+         otherwise make the Covered Software available under the terms of any
+         subsequent version of the License published by the license steward.
+ 
+         4.3. Modified Versions.  When You are an Initial Developer and You want
+         to create a new license for Your Original Software, You may create and
+         use a modified version of this License if You: (a) rename the license
+         and remove any references to the name of the license steward (except to
+         note that the license differs from this License); and (b) otherwise
+         make it clear that the license contains terms which differ from this
+         License.
+ 
+   5. DISCLAIMER OF WARRANTY.
+ 
+      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS,
+      WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+      WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
+      DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE
+      ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS
+      WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU
+      (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
+      NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY
+      CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
+      SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+ 
+   6. TERMINATION.
+ 
+         6.1. This License and the rights granted hereunder will terminate
+         automatically if You fail to comply with terms herein and fail to cure
+         such breach within 30 days of becoming aware of the breach. Provisions
+         which, by their nature, must remain in effect beyond the termination of
+         this License shall survive.
+ 
+         6.2. If You assert a patent infringement claim (excluding declaratory
+         judgment actions) against Initial Developer or a Contributor (the
+         Initial Developer or Contributor against whom You assert such
+         claim is referred to as .Participant.) alleging that the
+         Participant Software (meaning the Contributor Version where the
+         Participant is a Contributor or the Original Software where the
+         Participant is the Initial Developer) directly or indirectly
+         infringes any patent, then any and all rights granted directly or
+         indirectly to You by such Participant, the Initial Developer (if the
+         Initial Developer is not the Participant) and all Contributors
+         under Sections 2.1 and/or 2.2 of this License shall, upon 60 days
+         notice from Participant terminate prospectively and automatically at
+         the expiration of such 60 day notice period, unless if within such
+         60 day period You withdraw Your claim with respect to the
+         Participant Software against such Participant either unilaterally or
+         pursuant to a written agreement with Participant.
+ 
+         6.3. In the event of termination under Sections 6.1 or 6.2 above, all
+         end user licenses that have been validly granted by You or any
+         distributor hereunder prior to termination (excluding licenses granted
+         to You by any distributor) shall survive termination.
+ 
+   7. LIMITATION OF LIABILITY.
+ 
+      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
+      NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER,
+      ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY
+      SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT,
+      SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING,
+      WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
+      STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL
+      DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
+      POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY
+      TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY.S
+      NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME
+      JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+      CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
+      YOU.
+ 
+   8. U.S. GOVERNMENT END USERS.
+ 
+      The Covered Software is a .commercial item,. as that term is defined in 48
+      C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as
+      that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and .commercial
+      computer software documentation. as such terms are used in 48 C.F.R. 12.212
+      (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+      through 227.7202-4 (June 1995), all U.S. Government End Users acquire
+      Covered Software with only those rights set forth herein. This U.S.
+      Government Rights clause is in lieu of, and supersedes, any other FAR,
+      DFAR, or other clause or provision that addresses Government rights in
+      computer software under this License.
+ 
+   9. MISCELLANEOUS.
+ 
+      This License represents the complete agreement concerning subject matter
+      hereof. If any provision of this License is held to be unenforceable, such
+      provision shall be reformed only to the extent necessary to make it
+      enforceable.  This License shall be governed by the law of the jurisdiction
+      specified in a notice contained within the Original Software (except to the
+      extent applicable law, if any, provides otherwise), excluding such
+      jurisdiction.s conflict-of-law provisions. Any litigation relating to this
+      License shall be subject to the jurisdiction of the courts located in the
+      jurisdiction and venue specified in a notice contained within the Original
+      Software, with the losing party responsible for costs, including, without
+      limitation, court costs and reasonable attorneys. fees and expenses. The
+      application of the United Nations Convention on Contracts for the
+      International Sale of Goods is expressly excluded. Any law or regulation
+      which provides that the language of a contract shall be construed against
+      the drafter shall not apply to this License. You agree that You alone are
+      responsible for compliance with the United States export administration
+      regulations (and the export control laws and regulation of any other countries)
+      when You use, distribute or otherwise make available any Covered Software.
+ 
+   10. RESPONSIBILITY FOR CLAIMS.
+ 
+      As between Initial Developer and the Contributors, each party is
+      responsible for claims and damages arising, directly or indirectly, out of
+      its utilization of rights under this License and You agree to work with
+      Initial Developer and Contributors to distribute such responsibility on an
+      equitable basis. Nothing herein is intended or shall be deemed to
+      constitute any admission of liability.
+ 
+      NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
+      LICENSE (CDDL)
+ 
+      The code released under the CDDL shall be governed by the laws of the State
+      of California (excluding conflict-of-law provisions). Any litigation
+      relating to this License shall be subject to the jurisdiction of the
+      Federal Courts of the Northern District of California and the state courts
+      of the State of California, with venue lying in Santa Clara County,
+      California.
+ 
+ **********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/394ad086/assemble/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --cc assemble/src/main/resources/NOTICE
index 0000000,f6370f2..b19c90a
mode 000000,100644..100644
--- a/assemble/src/main/resources/NOTICE
+++ b/assemble/src/main/resources/NOTICE
@@@ -1,0 -1,61 +1,23 @@@
+ Apache Accumulo
+ Copyright 2011-2016 The Apache Software Foundation
+ 
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+ 
+ **********
+ 
+ This product includes JCommander (https://github.com/cbeust/jcommander),
+ Copyright 2010 Cedric Beust cedric@beust.com.
+ 
+ **********
+ 
 -This product includes Apache Commons Math (https://commons.apache.org/proper/commons-math/).
 -Copyright 2001-2010 The Apache Software Foundation
 -
 -From commons-math NOTICE.txt:
 -
 -    ===============================================================================
 -    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
 -    ===============================================================================
 -
 -    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.
 -    ===============================================================================
 -
 -    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
 -    ===============================================================================
++From Apache Commons Math3:
++
++    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/394ad086/core/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/394ad086/examples/simple/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/394ad086/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/394ad086/server/base/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/394ad086/server/monitor/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/394ad086/server/tserver/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/394ad086/shell/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/394ad086/test/pom.xml
----------------------------------------------------------------------


[02/18] accumulo git commit: ACCUMULO-4382 Clean up license/notice files

Posted by ct...@apache.org.
ACCUMULO-4382 Clean up license/notice files

Remove unnecessary contents.
Converge on a consistent formatting.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dbdba2f9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dbdba2f9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dbdba2f9

Branch: refs/heads/master
Commit: dbdba2f9319e8fabc4279bb052e0c9db4b0852aa
Parents: a8d1acd
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Jul 21 17:00:26 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jul 21 18:12:48 2016 -0400

----------------------------------------------------------------------
 LICENSE                                         | 108 +++---
 NOTICE                                          |   7 -
 assemble/bin-LICENSE                            | 335 +++++++++----------
 assemble/bin-NOTICE                             |  14 +-
 .../main/appended-resources/META-INF/LICENSE    |  71 ++--
 server/base/pom.xml                             |  29 --
 .../src/main/appended-resources/META-INF/NOTICE |   9 -
 server/base/src/main/javadoc/META-INF/LICENSE   | 202 -----------
 server/base/src/main/javadoc/META-INF/NOTICE    |   5 -
 .../main/appended-resources/META-INF/LICENSE    | 100 +++---
 server/monitor/src/main/javadoc/META-INF/NOTICE |   5 -
 server/native/src/main/resources/LICENSE        |   1 -
 server/native/src/main/resources/NOTICE         |   2 +-
 server/tserver/pom.xml                          |  29 --
 14 files changed, 321 insertions(+), 596 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 7082472..4cfbbec 100644
--- a/LICENSE
+++ b/LICENSE
@@ -201,20 +201,25 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+**********
 
 APACHE ACCUMULO SUBCOMPONENTS:
 
 The Apache Accumulo project contains subcomponents with separate copyright
 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.
+subcomponents is subject to the terms and conditions of the following licenses.
 
-This product bundles softare from the European Commission project OneLab
-under contract 034819 (http://www.one-lab.org), which is available under
-a "3-clause BSD" license. For details, see
-  core/src/main/java/org/apache/accumulo/core/bloomfilter/
+**********
+
+This product includes software from the European Commission project OneLab:
+
+* BloomFilter.java
+* DynamicBloomFilter.java
+* Filter.java
+
+    Copyright (c) 2005, European Commission project OneLab under contract 034819
+    (http://www.one-lab.org)
 
-    Copyright (c) 2005, European Commission project OneLab under contract 034819 (http://www.one-lab.org)
     All rights reserved.
     Redistribution and use in source and binary forms, with or
     without modification, are permitted provided that the following
@@ -242,56 +247,65 @@ a "3-clause BSD" license. For details, see
     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     POSSIBILITY OF SUCH DAMAGE.
 
-----
+**********
+
+This product includes JQuery:
+
+    Copyright 2011, John Resig
+    Dual licensed under the MIT or GPL Version 2 licenses.
+    http://jquery.org/license
+
+    Includes Sizzle.js
+    http://sizzlejs.com/
+    Copyright 2011, The Dojo Foundation
+    Released under the MIT, BSD, and GPL Licenses.
 
-This product bundles JQuery and Flot, which are each available under
-The MIT License (MIT). For details, see
-  server/monitor/src/main/resources/web/flot/
+    Distributed under the MIT License:
 
-Text of the MIT License:
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use,
+    copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following
+    conditions:
 
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    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.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-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,
+This product includes Flot:
 
-Copyright (c) 2007-2009 IOLA and Ole Laursen
+    Copyright (c) 2007-2009 IOLA and Ole Laursen
 
-Available under the MIT License (see above)
+    Available under the MIT License (see above)
 
-Flot bundles additional works:
+    Flot bundles additional works:
 
-jquery.pie.js
-* Created by Brian Medendorp, June 2009
-* Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+    jquery.pie.js
+    * Created by Brian Medendorp, June 2009
+    * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
 
-jquery.flot.resize.js
-* Inline dependency:
- * jQuery resize event - v1.1 - 3/14/2010
- * http://benalman.com/projects/jquery-resize-plugin/
- *
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
+    jquery.flot.resize.js
+    * Inline dependency:
+     * jQuery resize event - v1.1 - 3/14/2010
+     * http://benalman.com/projects/jquery-resize-plugin/
+     *
+     * Copyright (c) 2010 "Cowboy" Ben Alman
+     * Dual licensed under the MIT and GPL licenses.
+     * http://benalman.com/about/license/
 
-distributed under the MIT license (see above)
+    distributed under the MIT license (see above)
 
-----
+**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index b2d441a..3a3fc27 100644
--- a/NOTICE
+++ b/NOTICE
@@ -3,10 +3,3 @@ Copyright 2011-2016 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
-
-This product includes the following work from the Apache Thrift project:
-
-TNonblockingServerSocket.java
-
-Apache Thrift
-Copyright 2006-2010 The Apache Software Foundation.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/assemble/bin-LICENSE
----------------------------------------------------------------------
diff --git a/assemble/bin-LICENSE b/assemble/bin-LICENSE
index 2f5fd9f..9cfab86 100644
--- a/assemble/bin-LICENSE
+++ b/assemble/bin-LICENSE
@@ -201,117 +201,116 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+**********
 
 APACHE ACCUMULO SUBCOMPONENTS:
 
 The Apache Accumulo project contains subcomponents with separate copyright
 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.
+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),
+**********
+
+This product includes software from the European Commission project OneLab:
 
 * BloomFilter.java
 * DynamicBloomFilter.java
 * 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
- * 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 the University Catholique de Louvain - UCL
- *    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.
-
-----
-
-This product bundles JQuery
-
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
-
-Distributed under the MIT License:
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-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/
-
-Copyright (c) 2007-2009 IOLA and Ole Laursen
-
-Available under the MIT License (see above)
-
-Flot bundles additional works:
-
-jquery.pie.js
-* Created by Brian Medendorp, June 2009
-* Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
-
-jquery.flot.resize.js
-* Inline dependency:
- * jQuery resize event - v1.1 - 3/14/2010
- * http://benalman.com/projects/jquery-resize-plugin/
- *
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
-
-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:
+    Copyright (c) 2005, European Commission project OneLab under contract 034819
+    (http://www.one-lab.org)
+
+    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 the University Catholique de Louvain - UCL
+       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.
+
+**********
+
+This product includes JQuery:
+
+    Copyright 2011, John Resig
+    Dual licensed under the MIT or GPL Version 2 licenses.
+    http://jquery.org/license
+
+    Includes Sizzle.js
+    http://sizzlejs.com/
+    Copyright 2011, The Dojo Foundation
+    Released under the MIT, BSD, and GPL Licenses.
+
+    Distributed under the MIT License:
+
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use,
+    copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following
+    conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    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 includes Flot:
+
+    Copyright (c) 2007-2009 IOLA and Ole Laursen
+
+    Available under the MIT License (see above)
+
+    Flot bundles additional works:
+
+    jquery.pie.js
+    * Created by Brian Medendorp, June 2009
+    * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+
+    jquery.flot.resize.js
+    * Inline dependency:
+     * jQuery resize event - v1.1 - 3/14/2010
+     * http://benalman.com/projects/jquery-resize-plugin/
+     *
+     * Copyright (c) 2010 "Cowboy" Ben Alman
+     * Dual licensed under the MIT and GPL licenses.
+     * http://benalman.com/about/license/
+
+    distributed under the MIT license (see above)
+
+**********
+
+This product includes jline:
 
     The BSD License
 
@@ -348,47 +347,48 @@ 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 includes Apache Commons Math:
 
     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.math.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 +402,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 +414,101 @@ 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:
-    
-    
+
+
     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 
+
+    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 
+
+    - 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 
+
+    - 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 
+
+    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  
+    "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 
+    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  
+    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. 
+    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 
+    routines translated in MersenneTwister class in package
     org.apache.commons.math.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 +521,10 @@ 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.
 
----------
 
-This distribution of this product bundles slf4j, which is available
-under the following MIT license:
+**********
+
+This product includes slf4j:
 
     Copyright (c) 2004-2013 QOS.ch
     All rights reserved.
@@ -548,10 +548,9 @@ 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).
+This product includes javax.servlet-api (http://servlet-spec.java.net):
 
   COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
 
@@ -881,4 +880,4 @@ available under the CDDL 1.0 license (http://servlet-spec.java.net).
      of the State of California, with venue lying in Santa Clara County,
      California.
 
-------
+**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/assemble/bin-NOTICE
----------------------------------------------------------------------
diff --git a/assemble/bin-NOTICE b/assemble/bin-NOTICE
index 07d574b..f6370f2 100644
--- a/assemble/bin-NOTICE
+++ b/assemble/bin-NOTICE
@@ -4,18 +4,18 @@ Copyright 2011-2016 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
+**********
+
 This product includes JCommander (https://github.com/cbeust/jcommander),
 Copyright 2010 Cedric Beust cedric@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/).
+This product includes Apache Commons Math (https://commons.apache.org/proper/commons-math/).
 Copyright 2001-2010 The Apache Software Foundation
 
+From commons-math NOTICE.txt:
+
     ===============================================================================
     The LinearConstraint, LinearObjectiveFunction, LinearOptimizer,
     RelationShip, SimplexSolver and SimplexTableau classes in package
@@ -55,5 +55,7 @@ Copyright 2001-2010 The Apache Software Foundation
     All rights reserved
     ===============================================================================
 
+**********
+
 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/dbdba2f9/core/src/main/appended-resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/core/src/main/appended-resources/META-INF/LICENSE b/core/src/main/appended-resources/META-INF/LICENSE
index af566f0..f3478ea 100644
--- a/core/src/main/appended-resources/META-INF/LICENSE
+++ b/core/src/main/appended-resources/META-INF/LICENSE
@@ -1,46 +1,47 @@
-----
+**********
 
 APACHE ACCUMULO SUBCOMPONENTS:
 
 The Apache Accumulo project contains subcomponents with separate copyright
 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.
+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),
+**********
+
+This product includes software from the European Commission project OneLab:
 
 * BloomFilter.java
 * DynamicBloomFilter.java
 * 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
- * 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 the University Catholique de Louvain - UCL
- *    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.
-
+    Copyright (c) 2005, European Commission project OneLab under contract 034819
+    (http://www.one-lab.org)
+
+    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 the University Catholique de Louvain - UCL
+       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.
+
+**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/base/pom.xml
----------------------------------------------------------------------
diff --git a/server/base/pom.xml b/server/base/pom.xml
index ea33018..7b11aa1 100644
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@ -118,34 +118,5 @@
         <directory>src/test/resources</directory>
       </testResource>
     </testResources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>license-javadocs</id>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>src/main/javadoc/META-INF/</directory>
-                  <targetPath>META-INF/</targetPath>
-                  <includes>
-                    <include>LICENSE</include>
-                    <include>NOTICE</include>
-                  </includes>
-                  <filtering>true</filtering>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
   </build>
 </project>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/base/src/main/appended-resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/server/base/src/main/appended-resources/META-INF/NOTICE b/server/base/src/main/appended-resources/META-INF/NOTICE
deleted file mode 100644
index a4f1f1a..0000000
--- a/server/base/src/main/appended-resources/META-INF/NOTICE
+++ /dev/null
@@ -1,9 +0,0 @@
-----
-
-This product includes the following work from the Apache Thrift project:
-
-TNonblockingServerSocket.java
-
-Apache Thrift
-Copyright 2006-2010 The Apache Software Foundation.
-

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/base/src/main/javadoc/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/server/base/src/main/javadoc/META-INF/LICENSE b/server/base/src/main/javadoc/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/server/base/src/main/javadoc/META-INF/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/base/src/main/javadoc/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/server/base/src/main/javadoc/META-INF/NOTICE b/server/base/src/main/javadoc/META-INF/NOTICE
deleted file mode 100644
index 3a3fc27..0000000
--- a/server/base/src/main/javadoc/META-INF/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Accumulo
-Copyright 2011-2016 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/monitor/src/main/appended-resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/appended-resources/META-INF/LICENSE b/server/monitor/src/main/appended-resources/META-INF/LICENSE
index 974cb4b..ae202cb 100644
--- a/server/monitor/src/main/appended-resources/META-INF/LICENSE
+++ b/server/monitor/src/main/appended-resources/META-INF/LICENSE
@@ -1,74 +1,70 @@
-----
+**********
 
 APACHE ACCUMULO SUBCOMPONENTS:
 
 The Apache Accumulo project contains subcomponents with separate copyright
 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.
+subcomponents is subject to the terms and conditions of the following licenses.
 
-----
+**********
 
-This product bundles JQuery
+This product includes JQuery:
 
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
+    Copyright 2011, John Resig
+    Dual licensed under the MIT or GPL Version 2 licenses.
+    http://jquery.org/license
 
-Distributed under the MIT License:
+    Includes Sizzle.js
+    http://sizzlejs.com/
+    Copyright 2011, The Dojo Foundation
+    Released under the MIT, BSD, and GPL Licenses.
 
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
+    Distributed under the MIT License:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use,
+    copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following
+    conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-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.
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
 
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    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,
+**********
 
-Copyright (c) 2007-2009 IOLA and Ole Laursen
+This product includes Flot:
 
-Available under the MIT License (see above)
+    Copyright (c) 2007-2009 IOLA and Ole Laursen
 
-Flot bundles additional works:
+    Available under the MIT License (see above)
 
-jquery.pie.js
-* Created by Brian Medendorp, June 2009
-* Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+    Flot bundles additional works:
 
-jquery.flot.resize.js
-* Inline dependency:
- * jQuery resize event - v1.1 - 3/14/2010
- * http://benalman.com/projects/jquery-resize-plugin/
- *
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
+    jquery.pie.js
+    * Created by Brian Medendorp, June 2009
+    * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
 
-distributed under the MIT license (see above)
+    jquery.flot.resize.js
+    * Inline dependency:
+     * jQuery resize event - v1.1 - 3/14/2010
+     * http://benalman.com/projects/jquery-resize-plugin/
+     *
+     * Copyright (c) 2010 "Cowboy" Ben Alman
+     * Dual licensed under the MIT and GPL licenses.
+     * http://benalman.com/about/license/
 
-For details, see
-  server/src/main/resources/web/flot/
+    distributed under the MIT license (see above)
 
-----
+**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/monitor/src/main/javadoc/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/javadoc/META-INF/NOTICE b/server/monitor/src/main/javadoc/META-INF/NOTICE
deleted file mode 100644
index 3a3fc27..0000000
--- a/server/monitor/src/main/javadoc/META-INF/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Accumulo
-Copyright 2011-2016 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/native/src/main/resources/LICENSE
----------------------------------------------------------------------
diff --git a/server/native/src/main/resources/LICENSE b/server/native/src/main/resources/LICENSE
index 6b0b127..d645695 100644
--- a/server/native/src/main/resources/LICENSE
+++ b/server/native/src/main/resources/LICENSE
@@ -200,4 +200,3 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/native/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/server/native/src/main/resources/NOTICE b/server/native/src/main/resources/NOTICE
index 3a3fc27..2316e0f 100644
--- a/server/native/src/main/resources/NOTICE
+++ b/server/native/src/main/resources/NOTICE
@@ -1,4 +1,4 @@
-Apache Accumulo
+Apache Accumulo Native Libraries
 Copyright 2011-2016 The Apache Software Foundation
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/tserver/pom.xml
----------------------------------------------------------------------
diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml
index 5ac1b46..fc1c9fb 100644
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@ -125,34 +125,5 @@
         </plugin>
       </plugins>
     </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>license-javadocs</id>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>src/main/javadoc/META-INF/</directory>
-                  <targetPath>META-INF/</targetPath>
-                  <includes>
-                    <include>LICENSE</include>
-                    <include>NOTICE</include>
-                  </includes>
-                  <filtering>true</filtering>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
   </build>
 </project>


[15/18] accumulo git commit: Merge branch '1.6' into 1.7

Posted by ct...@apache.org.
Merge branch '1.6' into 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f6465ac3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f6465ac3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f6465ac3

Branch: refs/heads/master
Commit: f6465ac3c3fee340fce5df4ebd6ce56487b25518
Parents: 612ede6 0fdd52a
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Jul 21 18:22:25 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jul 21 18:22:25 2016 -0400

----------------------------------------------------------------------
 LICENSE                                         | 109 ++-
 NOTICE                                          |   7 -
 assemble/bin-LICENSE                            | 924 -------------------
 assemble/bin-NOTICE                             |  59 --
 assemble/pom.xml                                |  17 -
 assemble/src/main/assemblies/component.xml      |  22 +-
 assemble/src/main/resources/LICENSE             | 921 ++++++++++++++++++
 assemble/src/main/resources/NOTICE              |  61 ++
 core/pom.xml                                    |  12 +-
 .../main/appended-resources/META-INF/LICENSE    |  71 +-
 examples/simple/pom.xml                         |  12 -
 pom.xml                                         |   3 +-
 server/base/pom.xml                             |  29 -
 .../src/main/appended-resources/META-INF/NOTICE |   9 -
 server/base/src/main/javadoc/META-INF/LICENSE   | 202 ----
 server/base/src/main/javadoc/META-INF/NOTICE    |   5 -
 server/monitor/pom.xml                          |   3 -
 .../main/appended-resources/META-INF/LICENSE    | 100 +-
 server/monitor/src/main/javadoc/META-INF/NOTICE |   5 -
 server/native/src/main/resources/LICENSE        |   1 -
 server/native/src/main/resources/NOTICE         |   2 +-
 server/tserver/pom.xml                          |  32 -
 shell/pom.xml                                   |  17 -
 test/pom.xml                                    |   3 -
 24 files changed, 1142 insertions(+), 1484 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/assemble/pom.xml
----------------------------------------------------------------------
diff --cc assemble/pom.xml
index 1ee64b4,c9bd8c5..58016ef
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@@ -170,47 -162,8 +170,30 @@@
      </dependency>
    </dependencies>
    <build>
-     <pluginManagement>
-       <plugins>
-         <plugin>
-           <groupId>org.apache.rat</groupId>
-           <artifactId>apache-rat-plugin</artifactId>
-           <configuration>
-             <excludes>
-               <exclude>bin-LICENSE</exclude>
-               <exclude>bin-NOTICE</exclude>
-               <exclude>nbproject/**</exclude>
-               <exclude>nb-configuration.xml</exclude>
-               <exclude>nbactions.xml</exclude>
-             </excludes>
-           </configuration>
-         </plugin>
-       </plugins>
-     </pluginManagement>
      <plugins>
        <plugin>
 +        <groupId>org.apache.maven.plugins</groupId>
 +        <artifactId>maven-dependency-plugin</artifactId>
 +        <executions>
 +          <execution>
 +            <!-- generate version listing for packaged dependencies -->
 +            <id>generate-dependencies-raw</id>
 +            <goals>
 +              <goal>list</goal>
 +            </goals>
 +            <phase>compile</phase>
 +            <configuration>
 +              <outputFile>${project.build.directory}/dependencies.raw.txt</outputFile>
 +              <outputScope>false</outputScope>
 +              <sort>true</sort>
 +              <!-- this list should match that in src/main/assemblies/component.xml -->
 +              <includeArtifactIds>commons-math,commons-vfs2,gson,guava,htrace-core,javax.servlet-api,jcommander,jetty-http,jetty-io,jetty-security,jetty-server,jetty-servlet,jetty-util,jline,libthrift,protobuf-java,slf4j-api,slf4j-log4j12</includeArtifactIds>
 +              <excludeTransitive>true</excludeTransitive>
 +            </configuration>
 +          </execution>
 +        </executions>
 +      </plugin>
 +      <plugin>
          <groupId>org.codehaus.mojo</groupId>
          <artifactId>exec-maven-plugin</artifactId>
          <executions>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/assemble/src/main/assemblies/component.xml
----------------------------------------------------------------------
diff --cc assemble/src/main/assemblies/component.xml
index 22a5c22,b9ea051..84a3a06
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@@ -248,30 -244,18 +248,28 @@@
        <directory>../</directory>
        <fileMode>0644</fileMode>
        <includes>
 -        <include>README</include>
 +        <include>README.md</include>
 +        <include>INSTALL.md</include>
 +        <include>BUILD.md</include>
 +      </includes>
 +    </fileSet>
 +    <fileSet>
 +      <directory>target</directory>
 +      <outputDirectory>lib</outputDirectory>
 +      <fileMode>0644</fileMode>
 +      <includes>
 +        <include>VERSIONS</include>
        </includes>
      </fileSet>
-   </fileSets>
-   <files>
-     <file>
-       <source>bin-NOTICE</source>
-       <destName>NOTICE</destName>
-       <fileMode>0644</fileMode>
-     </file>
-     <file>
-       <source>bin-LICENSE</source>
-       <destName>LICENSE</destName>
+     <fileSet>
+       <directory>src/main/resources</directory>
+       <directoryMode>0755</directoryMode>
        <fileMode>0644</fileMode>
-     </file>
-   </files>
+       <outputDirectory>.</outputDirectory>
+       <includes>
+         <include>LICENSE</include>
+         <include>NOTICE</include>
+       </includes>
+     </fileSet>
+   </fileSets>
  </component>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/assemble/src/main/resources/LICENSE
----------------------------------------------------------------------
diff --cc assemble/src/main/resources/LICENSE
index 0000000,9cfab86..9ba98fd
mode 000000,100644..100644
--- a/assemble/src/main/resources/LICENSE
+++ b/assemble/src/main/resources/LICENSE
@@@ -1,0 -1,883 +1,921 @@@
+ 
+                                  Apache License
+                            Version 2.0, January 2004
+                         http://www.apache.org/licenses/
+ 
+    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ 
+    1. Definitions.
+ 
+       "License" shall mean the terms and conditions for use, reproduction,
+       and distribution as defined by Sections 1 through 9 of this document.
+ 
+       "Licensor" shall mean the copyright owner or entity authorized by
+       the copyright owner that is granting the License.
+ 
+       "Legal Entity" shall mean the union of the acting entity and all
+       other entities that control, are controlled by, or are under common
+       control with that entity. For the purposes of this definition,
+       "control" means (i) the power, direct or indirect, to cause the
+       direction or management of such entity, whether by contract or
+       otherwise, or (ii) ownership of fifty percent (50%) or more of the
+       outstanding shares, or (iii) beneficial ownership of such entity.
+ 
+       "You" (or "Your") shall mean an individual or Legal Entity
+       exercising permissions granted by this License.
+ 
+       "Source" form shall mean the preferred form for making modifications,
+       including but not limited to software source code, documentation
+       source, and configuration files.
+ 
+       "Object" form shall mean any form resulting from mechanical
+       transformation or translation of a Source form, including but
+       not limited to compiled object code, generated documentation,
+       and conversions to other media types.
+ 
+       "Work" shall mean the work of authorship, whether in Source or
+       Object form, made available under the License, as indicated by a
+       copyright notice that is included in or attached to the work
+       (an example is provided in the Appendix below).
+ 
+       "Derivative Works" shall mean any work, whether in Source or Object
+       form, that is based on (or derived from) the Work and for which the
+       editorial revisions, annotations, elaborations, or other modifications
+       represent, as a whole, an original work of authorship. For the purposes
+       of this License, Derivative Works shall not include works that remain
+       separable from, or merely link (or bind by name) to the interfaces of,
+       the Work and Derivative Works thereof.
+ 
+       "Contribution" shall mean any work of authorship, including
+       the original version of the Work and any modifications or additions
+       to that Work or Derivative Works thereof, that is intentionally
+       submitted to Licensor for inclusion in the Work by the copyright owner
+       or by an individual or Legal Entity authorized to submit on behalf of
+       the copyright owner. For the purposes of this definition, "submitted"
+       means any form of electronic, verbal, or written communication sent
+       to the Licensor or its representatives, including but not limited to
+       communication on electronic mailing lists, source code control systems,
+       and issue tracking systems that are managed by, or on behalf of, the
+       Licensor for the purpose of discussing and improving the Work, but
+       excluding communication that is conspicuously marked or otherwise
+       designated in writing by the copyright owner as "Not a Contribution."
+ 
+       "Contributor" shall mean Licensor and any individual or Legal Entity
+       on behalf of whom a Contribution has been received by Licensor and
+       subsequently incorporated within the Work.
+ 
+    2. Grant of Copyright License. Subject to the terms and conditions of
+       this License, each Contributor hereby grants to You a perpetual,
+       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+       copyright license to reproduce, prepare Derivative Works of,
+       publicly display, publicly perform, sublicense, and distribute the
+       Work and such Derivative Works in Source or Object form.
+ 
+    3. Grant of Patent License. Subject to the terms and conditions of
+       this License, each Contributor hereby grants to You a perpetual,
+       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+       (except as stated in this section) patent license to make, have made,
+       use, offer to sell, sell, import, and otherwise transfer the Work,
+       where such license applies only to those patent claims licensable
+       by such Contributor that are necessarily infringed by their
+       Contribution(s) alone or by combination of their Contribution(s)
+       with the Work to which such Contribution(s) was submitted. If You
+       institute patent litigation against any entity (including a
+       cross-claim or counterclaim in a lawsuit) alleging that the Work
+       or a Contribution incorporated within the Work constitutes direct
+       or contributory patent infringement, then any patent licenses
+       granted to You under this License for that Work shall terminate
+       as of the date such litigation is filed.
+ 
+    4. Redistribution. You may reproduce and distribute copies of the
+       Work or Derivative Works thereof in any medium, with or without
+       modifications, and in Source or Object form, provided that You
+       meet the following conditions:
+ 
+       (a) You must give any other recipients of the Work or
+           Derivative Works a copy of this License; and
+ 
+       (b) You must cause any modified files to carry prominent notices
+           stating that You changed the files; and
+ 
+       (c) You must retain, in the Source form of any Derivative Works
+           that You distribute, all copyright, patent, trademark, and
+           attribution notices from the Source form of the Work,
+           excluding those notices that do not pertain to any part of
+           the Derivative Works; and
+ 
+       (d) If the Work includes a "NOTICE" text file as part of its
+           distribution, then any Derivative Works that You distribute must
+           include a readable copy of the attribution notices contained
+           within such NOTICE file, excluding those notices that do not
+           pertain to any part of the Derivative Works, in at least one
+           of the following places: within a NOTICE text file distributed
+           as part of the Derivative Works; within the Source form or
+           documentation, if provided along with the Derivative Works; or,
+           within a display generated by the Derivative Works, if and
+           wherever such third-party notices normally appear. The contents
+           of the NOTICE file are for informational purposes only and
+           do not modify the License. You may add Your own attribution
+           notices within Derivative Works that You distribute, alongside
+           or as an addendum to the NOTICE text from the Work, provided
+           that such additional attribution notices cannot be construed
+           as modifying the License.
+ 
+       You may add Your own copyright statement to Your modifications and
+       may provide additional or different license terms and conditions
+       for use, reproduction, or distribution of Your modifications, or
+       for any such Derivative Works as a whole, provided Your use,
+       reproduction, and distribution of the Work otherwise complies with
+       the conditions stated in this License.
+ 
+    5. Submission of Contributions. Unless You explicitly state otherwise,
+       any Contribution intentionally submitted for inclusion in the Work
+       by You to the Licensor shall be under the terms and conditions of
+       this License, without any additional terms or conditions.
+       Notwithstanding the above, nothing herein shall supersede or modify
+       the terms of any separate license agreement you may have executed
+       with Licensor regarding such Contributions.
+ 
+    6. Trademarks. This License does not grant permission to use the trade
+       names, trademarks, service marks, or product names of the Licensor,
+       except as required for reasonable and customary use in describing the
+       origin of the Work and reproducing the content of the NOTICE file.
+ 
+    7. Disclaimer of Warranty. Unless required by applicable law or
+       agreed to in writing, Licensor provides the Work (and each
+       Contributor provides its Contributions) on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied, including, without limitation, any warranties or conditions
+       of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+       PARTICULAR PURPOSE. You are solely responsible for determining the
+       appropriateness of using or redistributing the Work and assume any
+       risks associated with Your exercise of permissions under this License.
+ 
+    8. Limitation of Liability. In no event and under no legal theory,
+       whether in tort (including negligence), contract, or otherwise,
+       unless required by applicable law (such as deliberate and grossly
+       negligent acts) or agreed to in writing, shall any Contributor be
+       liable to You for damages, including any direct, indirect, special,
+       incidental, or consequential damages of any character arising as a
+       result of this License or out of the use or inability to use the
+       Work (including but not limited to damages for loss of goodwill,
+       work stoppage, computer failure or malfunction, or any and all
+       other commercial damages or losses), even if such Contributor
+       has been advised of the possibility of such damages.
+ 
+    9. Accepting Warranty or Additional Liability. While redistributing
+       the Work or Derivative Works thereof, You may choose to offer,
+       and charge a fee for, acceptance of support, warranty, indemnity,
+       or other liability obligations and/or rights consistent with this
+       License. However, in accepting such obligations, You may act only
+       on Your own behalf and on Your sole responsibility, not on behalf
+       of any other Contributor, and only if You agree to indemnify,
+       defend, and hold each Contributor harmless for any liability
+       incurred by, or claims asserted against, such Contributor by reason
+       of your accepting any such warranty or additional liability.
+ 
+    END OF TERMS AND CONDITIONS
+ 
+    APPENDIX: How to apply the Apache License to your work.
+ 
+       To apply the Apache License to your work, attach the following
+       boilerplate notice, with the fields enclosed by brackets "[]"
+       replaced with your own identifying information. (Don't include
+       the brackets!)  The text should be enclosed in the appropriate
+       comment syntax for the file format. We also recommend that a
+       file or class name and description of purpose be included on the
+       same "printed page" as the copyright notice for easier
+       identification within third-party archives.
+ 
+    Copyright [yyyy] [name of copyright owner]
+ 
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+ 
+        http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+ 
+ **********
+ 
+ APACHE ACCUMULO SUBCOMPONENTS:
+ 
+ The Apache Accumulo project contains subcomponents with separate copyright
+ 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 includes software from the European Commission project OneLab:
+ 
+ * BloomFilter.java
+ * DynamicBloomFilter.java
+ * Filter.java
+ 
+     Copyright (c) 2005, European Commission project OneLab under contract 034819
+     (http://www.one-lab.org)
+ 
+     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 the University Catholique de Louvain - UCL
+        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.
+ 
+ **********
+ 
+ This product includes JQuery:
+ 
+     Copyright 2011, John Resig
+     Dual licensed under the MIT or GPL Version 2 licenses.
+     http://jquery.org/license
+ 
+     Includes Sizzle.js
+     http://sizzlejs.com/
+     Copyright 2011, The Dojo Foundation
+     Released under the MIT, BSD, and GPL Licenses.
+ 
+     Distributed under the MIT License:
+ 
+     Permission is hereby granted, free of charge, to any person
+     obtaining a copy of this software and associated documentation
+     files (the "Software"), to deal in the Software without
+     restriction, including without limitation the rights to use,
+     copy, modify, merge, publish, distribute, sublicense, and/or sell
+     copies of the Software, and to permit persons to whom the
+     Software is furnished to do so, subject to the following
+     conditions:
+ 
+     The above copyright notice and this permission notice shall be
+     included in all copies or substantial portions of the Software.
+ 
+     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+     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 includes Flot:
+ 
+     Copyright (c) 2007-2009 IOLA and Ole Laursen
+ 
+     Available under the MIT License (see above)
+ 
+     Flot bundles additional works:
+ 
+     jquery.pie.js
+     * Created by Brian Medendorp, June 2009
+     * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+ 
+     jquery.flot.resize.js
+     * Inline dependency:
+      * jQuery resize event - v1.1 - 3/14/2010
+      * http://benalman.com/projects/jquery-resize-plugin/
+      *
+      * Copyright (c) 2010 "Cowboy" Ben Alman
+      * Dual licensed under the MIT and GPL licenses.
+      * http://benalman.com/about/license/
+ 
+     distributed under the MIT license (see above)
+ 
+ **********
+ 
+ This product includes jline:
+ 
+     The BSD License
+ 
+     Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>
+     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 JLine 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.
+ 
+ **********
+ 
+ This product includes Apache Commons Math:
+ 
+     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
+     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
+     THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR
+     IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES
+     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE
+     OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY
+     OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR
+     USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF
+     THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4)
+     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,
+     INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF
+     ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF
+     PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER
+     SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT
+     (INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE,
+     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:
+ 
+ 
+     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.
+ 
+     - 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.
+     ===============================================================================
+ 
+     Copyright and license statement for the original Mersenne twister C
+     routines translated in MersenneTwister class in package
+     org.apache.commons.math.random:
+ 
+        Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+        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
+             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.
+ 
++**********
++
++This product includes Protocol Buffers:
++
++    Copyright 2014, Google Inc. 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 Google Inc. 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.
++
++    Code generated by the Protocol Buffer compiler is owned by the owner
++    of the input file used when generating it. This code is not
++    standalone and requires a support library to be linked with it. This
++    support library is itself covered by the above license.
+ 
+ **********
+ 
+ This product includes slf4j:
+ 
+     Copyright (c) 2004-2013 QOS.ch
+     All rights reserved.
+ 
+     Permission is hereby granted, free  of charge, to any person obtaining
+     a  copy  of this  software  and  associated  documentation files  (the
+     "Software"), to  deal in  the Software without  restriction, including
+     without limitation  the rights to  use, copy, modify,  merge, publish,
+     distribute,  sublicense, and/or sell  copies of  the Software,  and to
+     permit persons to whom the Software  is furnished to do so, subject to
+     the following conditions:
+ 
+     The  above  copyright  notice  and  this permission  notice  shall  be
+     included in all copies or substantial portions of the Software.
+ 
+     THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+     EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+     MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+     LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 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 includes javax.servlet-api (http://servlet-spec.java.net):
+ 
+   COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+ 
+   1. Definitions.
+ 
+      1.1. Contributor. means each individual or entity that creates or
+      contributes to the creation of Modifications.
+ 
+      1.2. Contributor Version. means the combination of the Original Software,
+      prior Modifications used by a Contributor (if any), and the Modifications
+      made by that particular Contributor.
+ 
+      1.3. Covered Software. means (a) the Original Software, or (b)
+      Modifications, or (c) the combination of files containing Original Software
+      with files containing Modifications, in each case including portions thereof.
+ 
+      1.4. Executable. means the Covered Software in any form other than Source
+      Code.
+ 
+      1.5. Initial Developer. means the individual or entity that first makes
+      Original Software available under this License.
+ 
+      1.6. Larger Work. means a work which combines Covered Software or portions
+      thereof with code not governed by the terms of this License.
+ 
+      1.7. License. means this document.
+ 
+      1.8. Licensable. means having the right to grant, to the maximum extent
+      possible, whether at the time of the initial grant or subsequently
+      acquired, any and all of the rights conveyed herein.
+ 
+      1.9. Modifications. means the Source Code and Executable form of any of the
+      following:
+ 
+           A. Any file that results from an addition to, deletion from or
+           modification of the contents of a file containing Original Software or
+           previous Modifications;
+ 
+           B. Any new file that contains any part of the Original Software or
+           previous Modification; or
+ 
+           C. Any new file that is contributed or otherwise made available under
+           the terms of this License.
+ 
+      1.10. Original Software. means the Source Code and Executable form of
+      computer software code that is originally released under this License.
+ 
+      1.11. Patent Claims. means any patent claim(s), now owned or hereafter
+      acquired, including without limitation, method, process, and apparatus
+      claims, in any patent Licensable by grantor.
+ 
+      1.12. Source Code. means (a) the common form of computer software code in
+      which modifications are made and (b) associated documentation included in
+      or with such code.
+ 
+      1.13. You. (or .Your.) means an individual or a legal entity exercising
+      rights under, and complying with all of the terms of, this License. For
+      legal entities, .You. includes any entity which controls, is controlled by,
+      or is under common control with You. For purposes of this definition,
+      .control. means (a) the power, direct or indirect, to cause the direction
+      or management of such entity, whether by contract or otherwise, or (b)
+      ownership of more than fifty percent (50%) of the outstanding shares or
+      beneficial ownership of such entity.
+ 
+   2. License Grants.
+ 
+         2.1. The Initial Developer Grant.
+ 
+         Conditioned upon Your compliance with Section 3.1 below and subject to
+         third party intellectual property claims, the Initial Developer hereby
+         grants You a world-wide, royalty-free, non-exclusive license:
+ 
+            (a) under intellectual property rights (other than patent or
+            trademark) Licensable by Initial Developer, to use, reproduce,
+            modify, display, perform, sublicense and distribute the Original
+            Software (or portions thereof), with or without Modifications, and/or
+            as part of a Larger Work; and
+ 
+            (b) under Patent Claims infringed by the making, using or selling of
+            Original Software, to make, have made, use, practice, sell, and offer
+            for sale, and/or otherwise dispose of the Original Software (or
+            portions thereof).
+ 
+           (c) The licenses granted in Sections 2.1(a) and (b) are effective on
+           the date Initial Developer first distributes or otherwise makes the
+           Original Software available to a third party under the terms of this
+           License.
+ 
+           (d) Notwithstanding Section 2.1(b) above, no patent license is
+           granted: (1) for code that You delete from the Original Software, or
+           (2) for infringements caused by: (i) the modification of the Original
+           Software, or (ii) the combination of the Original Software with other
+           software or devices.
+ 
+       2.2. Contributor Grant.
+ 
+       Conditioned upon Your compliance with Section 3.1 below and subject to
+       third party intellectual property claims, each Contributor hereby grants
+       You a world-wide, royalty-free, non-exclusive license:
+ 
+           (a) under intellectual property rights (other than patent or
+           trademark) Licensable by Contributor to use, reproduce, modify,
+           display, perform, sublicense and distribute the Modifications created
+           by such Contributor (or portions thereof), either on an unmodified
+           basis, with other Modifications, as Covered Software and/or as part of
+           a Larger Work; and
+ 
+           (b) under Patent Claims infringed by the making, using, or selling of
+           Modifications made by that Contributor either alone and/or in
+           combination with its Contributor Version (or portions of such
+           combination), to make, use, sell, offer for sale, have made,
+           and/or otherwise dispose of: (1) Modifications made by that
+           Contributor (or portions thereof); and (2) the combination of
+           Modifications made by that Contributor with its Contributor Version
+           (or portions of such combination).
+ 
+           (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
+           on the date Contributor first distributes or otherwise makes the
+           Modifications available to a third party.
+ 
+           (d) Notwithstanding Section 2.2(b) above, no patent license is
+           granted: (1) for any code that Contributor has deleted from the
+           Contributor Version; (2) for infringements caused by: (i) third party
+           modifications of Contributor Version, or (ii) the combination of
+           Modifications made by that Contributor with other software (except as
+           part of the Contributor Version) or other devices; or (3) under
+           Patent Claims infringed by Covered Software in the absence of
+           Modifications made by that Contributor.
+ 
+   3. Distribution Obligations.
+ 
+         3.1. Availability of Source Code.  Any Covered Software that You
+         distribute or otherwise make available in Executable form must also be
+         made available in Source Code form and that Source Code form must be
+         distributed only under the terms of this License. You must include a
+         copy of this License with every copy of the Source Code form of the
+         Covered Software You distribute or otherwise make available. You must
+         inform recipients of any such Covered Software in Executable form as to
+         how they can obtain such Covered Software in Source Code form in a
+         reasonable manner on or through a medium customarily used for software
+         exchange.
+ 
+         3.2. Modifications.  The Modifications that You create or to which You
+         contribute are governed by the terms of this License. You represent that
+         You believe Your Modifications are Your original creation(s) and/or You
+         have sufficient rights to grant the rights conveyed by this License.
+ 
+         3.3. Required Notices.  You must include a notice in each of Your
+         Modifications that identifies You as the Contributor of the
+         Modification. You may not remove or alter any copyright, patent or
+         trademark notices contained within the Covered Software, or any notices
+         of licensing or any descriptive text giving attribution to any
+         Contributor or the Initial Developer.
+ 
+         3.4. Application of Additional Terms.  You may not offer or impose any
+         terms on any Covered Software in Source Code form that alters or
+         restricts the applicable version of this License or the recipients.
+         rights hereunder.  You may choose to offer, and to charge a fee for,
+         warranty, support, indemnity or liability obligations to one or more
+         recipients of Covered Software. However, you may do so only on Your own
+         behalf, and not on behalf of the Initial Developer or any Contributor.
+         You must make it absolutely clear that any such warranty, support,
+         indemnity or liability obligation is offered by You alone, and You
+         hereby agree to indemnify the Initial Developer and every Contributor
+         for any liability incurred by the Initial Developer or such Contributor
+         as a result of warranty, support, indemnity or liability terms You
+         offer.
+ 
+         3.5. Distribution of Executable Versions.  You may distribute the
+         Executable form of the Covered Software under the terms of this License
+         or under the terms of a license of Your choice, which may contain terms
+         different from this License, provided that You are in compliance with
+         the terms of this License and that the license for the Executable form
+         does not attempt to limit or alter the recipient.s rights in the Source
+         Code form from the rights set forth in this License. If You distribute
+         the Covered Software in Executable form under a different license, You
+         must make it absolutely clear that any terms which differ from this
+         License are offered by You alone, not by the Initial Developer or
+         Contributor. You hereby agree to indemnify the Initial Developer and
+         every Contributor for any liability incurred by the Initial Developer or
+         such Contributor as a result of any such terms You offer.
+ 
+         3.6. Larger Works.  You may create a Larger Work by combining Covered
+         Software with other code not governed by the terms of this License and
+         distribute the Larger Work as a single product. In such a case, You must
+         make sure the requirements of this License are fulfilled for the Covered
+         Software.
+ 
+   4. Versions of the License.
+ 
+         4.1. New Versions.  Sun Microsystems, Inc. is the initial license
+         steward and may publish revised and/or new versions of this License from
+         time to time. Each version will be given a distinguishing version
+         number. Except as provided in Section 4.3, no one other than the license
+         steward has the right to modify this License.
+ 
+         4.2. Effect of New Versions.  You may always continue to use, distribute
+         or otherwise make the Covered Software available under the terms of the
+         version of the License under which You originally received the Covered
+         Software. If the Initial Developer includes a notice in the Original
+         Software prohibiting it from being distributed or otherwise made
+         available under any subsequent version of the License, You must
+         distribute and make the Covered Software available under the terms of
+         the version of the License under which You originally received the
+         Covered Software. Otherwise, You may also choose to use, distribute or
+         otherwise make the Covered Software available under the terms of any
+         subsequent version of the License published by the license steward.
+ 
+         4.3. Modified Versions.  When You are an Initial Developer and You want
+         to create a new license for Your Original Software, You may create and
+         use a modified version of this License if You: (a) rename the license
+         and remove any references to the name of the license steward (except to
+         note that the license differs from this License); and (b) otherwise
+         make it clear that the license contains terms which differ from this
+         License.
+ 
+   5. DISCLAIMER OF WARRANTY.
+ 
+      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS,
+      WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+      WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
+      DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE
+      ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS
+      WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU
+      (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
+      NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY
+      CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
+      SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+ 
+   6. TERMINATION.
+ 
+         6.1. This License and the rights granted hereunder will terminate
+         automatically if You fail to comply with terms herein and fail to cure
+         such breach within 30 days of becoming aware of the breach. Provisions
+         which, by their nature, must remain in effect beyond the termination of
+         this License shall survive.
+ 
+         6.2. If You assert a patent infringement claim (excluding declaratory
+         judgment actions) against Initial Developer or a Contributor (the
+         Initial Developer or Contributor against whom You assert such
+         claim is referred to as .Participant.) alleging that the
+         Participant Software (meaning the Contributor Version where the
+         Participant is a Contributor or the Original Software where the
+         Participant is the Initial Developer) directly or indirectly
+         infringes any patent, then any and all rights granted directly or
+         indirectly to You by such Participant, the Initial Developer (if the
+         Initial Developer is not the Participant) and all Contributors
+         under Sections 2.1 and/or 2.2 of this License shall, upon 60 days
+         notice from Participant terminate prospectively and automatically at
+         the expiration of such 60 day notice period, unless if within such
+         60 day period You withdraw Your claim with respect to the
+         Participant Software against such Participant either unilaterally or
+         pursuant to a written agreement with Participant.
+ 
+         6.3. In the event of termination under Sections 6.1 or 6.2 above, all
+         end user licenses that have been validly granted by You or any
+         distributor hereunder prior to termination (excluding licenses granted
+         to You by any distributor) shall survive termination.
+ 
+   7. LIMITATION OF LIABILITY.
+ 
+      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
+      NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER,
+      ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY
+      SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT,
+      SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING,
+      WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
+      STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL
+      DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
+      POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY
+      TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY.S
+      NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME
+      JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+      CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
+      YOU.
+ 
+   8. U.S. GOVERNMENT END USERS.
+ 
+      The Covered Software is a .commercial item,. as that term is defined in 48
+      C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as
+      that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and .commercial
+      computer software documentation. as such terms are used in 48 C.F.R. 12.212
+      (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+      through 227.7202-4 (June 1995), all U.S. Government End Users acquire
+      Covered Software with only those rights set forth herein. This U.S.
+      Government Rights clause is in lieu of, and supersedes, any other FAR,
+      DFAR, or other clause or provision that addresses Government rights in
+      computer software under this License.
+ 
+   9. MISCELLANEOUS.
+ 
+      This License represents the complete agreement concerning subject matter
+      hereof. If any provision of this License is held to be unenforceable, such
+      provision shall be reformed only to the extent necessary to make it
+      enforceable.  This License shall be governed by the law of the jurisdiction
+      specified in a notice contained within the Original Software (except to the
+      extent applicable law, if any, provides otherwise), excluding such
+      jurisdiction.s conflict-of-law provisions. Any litigation relating to this
+      License shall be subject to the jurisdiction of the courts located in the
+      jurisdiction and venue specified in a notice contained within the Original
+      Software, with the losing party responsible for costs, including, without
+      limitation, court costs and reasonable attorneys. fees and expenses. The
+      application of the United Nations Convention on Contracts for the
+      International Sale of Goods is expressly excluded. Any law or regulation
+      which provides that the language of a contract shall be construed against
+      the drafter shall not apply to this License. You agree that You alone are
+      responsible for compliance with the United States export administration
+      regulations (and the export control laws and regulation of any other countries)
+      when You use, distribute or otherwise make available any Covered Software.
+ 
+   10. RESPONSIBILITY FOR CLAIMS.
+ 
+      As between Initial Developer and the Contributors, each party is
+      responsible for claims and damages arising, directly or indirectly, out of
+      its utilization of rights under this License and You agree to work with
+      Initial Developer and Contributors to distribute such responsibility on an
+      equitable basis. Nothing herein is intended or shall be deemed to
+      constitute any admission of liability.
+ 
+      NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
+      LICENSE (CDDL)
+ 
+      The code released under the CDDL shall be governed by the laws of the State
+      of California (excluding conflict-of-law provisions). Any litigation
+      relating to this License shall be subject to the jurisdiction of the
+      Federal Courts of the Northern District of California and the state courts
+      of the State of California, with venue lying in Santa Clara County,
+      California.
+ 
+ **********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/core/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/examples/simple/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/server/base/pom.xml
----------------------------------------------------------------------
diff --cc server/base/pom.xml
index 6096017,7b11aa1..288b359
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@@ -127,59 -118,5 +127,30 @@@
          <directory>src/test/resources</directory>
        </testResource>
      </testResources>
-     <plugins>
-       <plugin>
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-resources-plugin</artifactId>
-         <executions>
-           <execution>
-             <id>license-javadocs</id>
-             <goals>
-               <goal>copy-resources</goal>
-             </goals>
-             <phase>prepare-package</phase>
-             <configuration>
-               <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
-               <resources>
-                 <resource>
-                   <directory>src/main/javadoc/META-INF/</directory>
-                   <targetPath>META-INF/</targetPath>
-                   <includes>
-                     <include>LICENSE</include>
-                     <include>NOTICE</include>
-                   </includes>
-                   <filtering>true</filtering>
-                 </resource>
-               </resources>
-             </configuration>
-           </execution>
-         </executions>
-       </plugin>
-     </plugins>
    </build>
 +  <profiles>
 +    <profile>
 +      <id>protobuf</id>
 +      <build>
 +        <plugins>
 +          <plugin>
 +            <groupId>org.codehaus.mojo</groupId>
 +            <artifactId>exec-maven-plugin</artifactId>
 +            <executions>
 +              <execution>
 +                <id>generate-protobuf</id>
 +                <goals>
 +                  <goal>exec</goal>
 +                </goals>
 +                <phase>generate-sources</phase>
 +                <configuration>
 +                  <executable>${basedir}/src/main/scripts/generate-protobuf.sh</executable>
 +                </configuration>
 +              </execution>
 +            </executions>
 +          </plugin>
 +        </plugins>
 +      </build>
 +    </profile>
 +  </profiles>
  </project>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/server/monitor/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/server/tserver/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/shell/pom.xml
----------------------------------------------------------------------
diff --cc shell/pom.xml
index 85bc740,0000000..a102d1e
mode 100644,000000..100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@@ -1,145 -1,0 +1,128 @@@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!--
 +  Licensed to the Apache Software Foundation (ASF) under one or more
 +  contributor license agreements.  See the NOTICE file distributed with
 +  this work for additional information regarding copyright ownership.
 +  The ASF licenses this file to You under the Apache License, Version 2.0
 +  (the "License"); you may not use this file except in compliance with
 +  the License.  You may obtain a copy of the License at
 +
 +      http://www.apache.org/licenses/LICENSE-2.0
 +
 +  Unless required by applicable law or agreed to in writing, software
 +  distributed under the License is distributed on an "AS IS" BASIS,
 +  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 +  See the License for the specific language governing permissions and
 +  limitations under the License.
 +-->
 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 +  <modelVersion>4.0.0</modelVersion>
 +  <parent>
 +    <groupId>org.apache.accumulo</groupId>
 +    <artifactId>accumulo-project</artifactId>
 +    <version>1.7.3-SNAPSHOT</version>
 +  </parent>
 +  <artifactId>accumulo-shell</artifactId>
 +  <name>Apache Accumulo Shell</name>
 +  <description>An interactive shell for accessing Apache Accumulo via a command line interface.</description>
 +  <dependencies>
 +    <dependency>
 +      <groupId>com.beust</groupId>
 +      <artifactId>jcommander</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>com.google.auto.service</groupId>
 +      <artifactId>auto-service</artifactId>
 +      <optional>true</optional>
 +    </dependency>
 +    <dependency>
 +      <groupId>com.google.guava</groupId>
 +      <artifactId>guava</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-cli</groupId>
 +      <artifactId>commons-cli</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-codec</groupId>
 +      <artifactId>commons-codec</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-collections</groupId>
 +      <artifactId>commons-collections</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-configuration</groupId>
 +      <artifactId>commons-configuration</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-io</groupId>
 +      <artifactId>commons-io</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-lang</groupId>
 +      <artifactId>commons-lang</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>jline</groupId>
 +      <artifactId>jline</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>log4j</groupId>
 +      <artifactId>log4j</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.accumulo</groupId>
 +      <artifactId>accumulo-core</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.accumulo</groupId>
 +      <artifactId>accumulo-fate</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.accumulo</groupId>
 +      <artifactId>accumulo-start</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.accumulo</groupId>
 +      <artifactId>accumulo-tracer</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.commons</groupId>
 +      <artifactId>commons-vfs2</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.hadoop</groupId>
 +      <artifactId>hadoop-client</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.thrift</groupId>
 +      <artifactId>libthrift</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>junit</groupId>
 +      <artifactId>junit</artifactId>
 +      <scope>test</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.easymock</groupId>
 +      <artifactId>easymock</artifactId>
 +      <scope>test</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.powermock</groupId>
 +      <artifactId>powermock-api-easymock</artifactId>
 +      <scope>test</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.powermock</groupId>
 +      <artifactId>powermock-core</artifactId>
 +      <scope>test</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.powermock</groupId>
 +      <artifactId>powermock-module-junit4</artifactId>
 +      <scope>test</scope>
 +    </dependency>
 +  </dependencies>
-   <build>
-     <pluginManagement>
-       <plugins>
-         <plugin>
-           <groupId>org.apache.rat</groupId>
-           <artifactId>apache-rat-plugin</artifactId>
-           <configuration>
-             <excludes>
-               <exclude>nbproject/**</exclude>
-               <exclude>nb-configuration.xml</exclude>
-               <exclude>nbactions.xml</exclude>
-             </excludes>
-           </configuration>
-         </plugin>
-       </plugins>
-     </pluginManagement>
-   </build>
 +</project>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6465ac3/test/pom.xml
----------------------------------------------------------------------
diff --cc test/pom.xml
index 032b97d,e3cba7e..4c73f89
--- a/test/pom.xml
+++ b/test/pom.xml
@@@ -201,12 -181,8 +201,9 @@@
            <artifactId>apache-rat-plugin</artifactId>
            <configuration>
              <excludes>
 +              <exclude>compat/japi-compliance/exclude_classes.txt</exclude>
                <exclude>system/bench/lib/*splits</exclude>
                <exclude>system/continuous/*.txt</exclude>
-               <exclude>nbproject/**</exclude>
-               <exclude>nb-configuration.xml</exclude>
-               <exclude>nbactions.xml</exclude>
              </excludes>
            </configuration>
          </plugin>


[04/18] accumulo git commit: ACCUMULO-4382 Clean up license/notice files

Posted by ct...@apache.org.
ACCUMULO-4382 Clean up license/notice files

Remove unnecessary contents.
Converge on a consistent formatting.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dbdba2f9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dbdba2f9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dbdba2f9

Branch: refs/heads/1.8
Commit: dbdba2f9319e8fabc4279bb052e0c9db4b0852aa
Parents: a8d1acd
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Jul 21 17:00:26 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jul 21 18:12:48 2016 -0400

----------------------------------------------------------------------
 LICENSE                                         | 108 +++---
 NOTICE                                          |   7 -
 assemble/bin-LICENSE                            | 335 +++++++++----------
 assemble/bin-NOTICE                             |  14 +-
 .../main/appended-resources/META-INF/LICENSE    |  71 ++--
 server/base/pom.xml                             |  29 --
 .../src/main/appended-resources/META-INF/NOTICE |   9 -
 server/base/src/main/javadoc/META-INF/LICENSE   | 202 -----------
 server/base/src/main/javadoc/META-INF/NOTICE    |   5 -
 .../main/appended-resources/META-INF/LICENSE    | 100 +++---
 server/monitor/src/main/javadoc/META-INF/NOTICE |   5 -
 server/native/src/main/resources/LICENSE        |   1 -
 server/native/src/main/resources/NOTICE         |   2 +-
 server/tserver/pom.xml                          |  29 --
 14 files changed, 321 insertions(+), 596 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 7082472..4cfbbec 100644
--- a/LICENSE
+++ b/LICENSE
@@ -201,20 +201,25 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+**********
 
 APACHE ACCUMULO SUBCOMPONENTS:
 
 The Apache Accumulo project contains subcomponents with separate copyright
 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.
+subcomponents is subject to the terms and conditions of the following licenses.
 
-This product bundles softare from the European Commission project OneLab
-under contract 034819 (http://www.one-lab.org), which is available under
-a "3-clause BSD" license. For details, see
-  core/src/main/java/org/apache/accumulo/core/bloomfilter/
+**********
+
+This product includes software from the European Commission project OneLab:
+
+* BloomFilter.java
+* DynamicBloomFilter.java
+* Filter.java
+
+    Copyright (c) 2005, European Commission project OneLab under contract 034819
+    (http://www.one-lab.org)
 
-    Copyright (c) 2005, European Commission project OneLab under contract 034819 (http://www.one-lab.org)
     All rights reserved.
     Redistribution and use in source and binary forms, with or
     without modification, are permitted provided that the following
@@ -242,56 +247,65 @@ a "3-clause BSD" license. For details, see
     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     POSSIBILITY OF SUCH DAMAGE.
 
-----
+**********
+
+This product includes JQuery:
+
+    Copyright 2011, John Resig
+    Dual licensed under the MIT or GPL Version 2 licenses.
+    http://jquery.org/license
+
+    Includes Sizzle.js
+    http://sizzlejs.com/
+    Copyright 2011, The Dojo Foundation
+    Released under the MIT, BSD, and GPL Licenses.
 
-This product bundles JQuery and Flot, which are each available under
-The MIT License (MIT). For details, see
-  server/monitor/src/main/resources/web/flot/
+    Distributed under the MIT License:
 
-Text of the MIT License:
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use,
+    copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following
+    conditions:
 
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    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.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-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,
+This product includes Flot:
 
-Copyright (c) 2007-2009 IOLA and Ole Laursen
+    Copyright (c) 2007-2009 IOLA and Ole Laursen
 
-Available under the MIT License (see above)
+    Available under the MIT License (see above)
 
-Flot bundles additional works:
+    Flot bundles additional works:
 
-jquery.pie.js
-* Created by Brian Medendorp, June 2009
-* Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+    jquery.pie.js
+    * Created by Brian Medendorp, June 2009
+    * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
 
-jquery.flot.resize.js
-* Inline dependency:
- * jQuery resize event - v1.1 - 3/14/2010
- * http://benalman.com/projects/jquery-resize-plugin/
- *
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
+    jquery.flot.resize.js
+    * Inline dependency:
+     * jQuery resize event - v1.1 - 3/14/2010
+     * http://benalman.com/projects/jquery-resize-plugin/
+     *
+     * Copyright (c) 2010 "Cowboy" Ben Alman
+     * Dual licensed under the MIT and GPL licenses.
+     * http://benalman.com/about/license/
 
-distributed under the MIT license (see above)
+    distributed under the MIT license (see above)
 
-----
+**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index b2d441a..3a3fc27 100644
--- a/NOTICE
+++ b/NOTICE
@@ -3,10 +3,3 @@ Copyright 2011-2016 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
-
-This product includes the following work from the Apache Thrift project:
-
-TNonblockingServerSocket.java
-
-Apache Thrift
-Copyright 2006-2010 The Apache Software Foundation.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/assemble/bin-LICENSE
----------------------------------------------------------------------
diff --git a/assemble/bin-LICENSE b/assemble/bin-LICENSE
index 2f5fd9f..9cfab86 100644
--- a/assemble/bin-LICENSE
+++ b/assemble/bin-LICENSE
@@ -201,117 +201,116 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+**********
 
 APACHE ACCUMULO SUBCOMPONENTS:
 
 The Apache Accumulo project contains subcomponents with separate copyright
 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.
+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),
+**********
+
+This product includes software from the European Commission project OneLab:
 
 * BloomFilter.java
 * DynamicBloomFilter.java
 * 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
- * 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 the University Catholique de Louvain - UCL
- *    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.
-
-----
-
-This product bundles JQuery
-
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
-
-Distributed under the MIT License:
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-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/
-
-Copyright (c) 2007-2009 IOLA and Ole Laursen
-
-Available under the MIT License (see above)
-
-Flot bundles additional works:
-
-jquery.pie.js
-* Created by Brian Medendorp, June 2009
-* Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
-
-jquery.flot.resize.js
-* Inline dependency:
- * jQuery resize event - v1.1 - 3/14/2010
- * http://benalman.com/projects/jquery-resize-plugin/
- *
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
-
-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:
+    Copyright (c) 2005, European Commission project OneLab under contract 034819
+    (http://www.one-lab.org)
+
+    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 the University Catholique de Louvain - UCL
+       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.
+
+**********
+
+This product includes JQuery:
+
+    Copyright 2011, John Resig
+    Dual licensed under the MIT or GPL Version 2 licenses.
+    http://jquery.org/license
+
+    Includes Sizzle.js
+    http://sizzlejs.com/
+    Copyright 2011, The Dojo Foundation
+    Released under the MIT, BSD, and GPL Licenses.
+
+    Distributed under the MIT License:
+
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use,
+    copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following
+    conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    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 includes Flot:
+
+    Copyright (c) 2007-2009 IOLA and Ole Laursen
+
+    Available under the MIT License (see above)
+
+    Flot bundles additional works:
+
+    jquery.pie.js
+    * Created by Brian Medendorp, June 2009
+    * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+
+    jquery.flot.resize.js
+    * Inline dependency:
+     * jQuery resize event - v1.1 - 3/14/2010
+     * http://benalman.com/projects/jquery-resize-plugin/
+     *
+     * Copyright (c) 2010 "Cowboy" Ben Alman
+     * Dual licensed under the MIT and GPL licenses.
+     * http://benalman.com/about/license/
+
+    distributed under the MIT license (see above)
+
+**********
+
+This product includes jline:
 
     The BSD License
 
@@ -348,47 +347,48 @@ 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 includes Apache Commons Math:
 
     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.math.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 +402,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 +414,101 @@ 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:
-    
-    
+
+
     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 
+
+    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 
+
+    - 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 
+
+    - 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 
+
+    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  
+    "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 
+    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  
+    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. 
+    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 
+    routines translated in MersenneTwister class in package
     org.apache.commons.math.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 +521,10 @@ 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.
 
----------
 
-This distribution of this product bundles slf4j, which is available
-under the following MIT license:
+**********
+
+This product includes slf4j:
 
     Copyright (c) 2004-2013 QOS.ch
     All rights reserved.
@@ -548,10 +548,9 @@ 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).
+This product includes javax.servlet-api (http://servlet-spec.java.net):
 
   COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
 
@@ -881,4 +880,4 @@ available under the CDDL 1.0 license (http://servlet-spec.java.net).
      of the State of California, with venue lying in Santa Clara County,
      California.
 
-------
+**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/assemble/bin-NOTICE
----------------------------------------------------------------------
diff --git a/assemble/bin-NOTICE b/assemble/bin-NOTICE
index 07d574b..f6370f2 100644
--- a/assemble/bin-NOTICE
+++ b/assemble/bin-NOTICE
@@ -4,18 +4,18 @@ Copyright 2011-2016 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
+**********
+
 This product includes JCommander (https://github.com/cbeust/jcommander),
 Copyright 2010 Cedric Beust cedric@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/).
+This product includes Apache Commons Math (https://commons.apache.org/proper/commons-math/).
 Copyright 2001-2010 The Apache Software Foundation
 
+From commons-math NOTICE.txt:
+
     ===============================================================================
     The LinearConstraint, LinearObjectiveFunction, LinearOptimizer,
     RelationShip, SimplexSolver and SimplexTableau classes in package
@@ -55,5 +55,7 @@ Copyright 2001-2010 The Apache Software Foundation
     All rights reserved
     ===============================================================================
 
+**********
+
 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/dbdba2f9/core/src/main/appended-resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/core/src/main/appended-resources/META-INF/LICENSE b/core/src/main/appended-resources/META-INF/LICENSE
index af566f0..f3478ea 100644
--- a/core/src/main/appended-resources/META-INF/LICENSE
+++ b/core/src/main/appended-resources/META-INF/LICENSE
@@ -1,46 +1,47 @@
-----
+**********
 
 APACHE ACCUMULO SUBCOMPONENTS:
 
 The Apache Accumulo project contains subcomponents with separate copyright
 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.
+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),
+**********
+
+This product includes software from the European Commission project OneLab:
 
 * BloomFilter.java
 * DynamicBloomFilter.java
 * 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
- * 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 the University Catholique de Louvain - UCL
- *    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.
-
+    Copyright (c) 2005, European Commission project OneLab under contract 034819
+    (http://www.one-lab.org)
+
+    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 the University Catholique de Louvain - UCL
+       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.
+
+**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/base/pom.xml
----------------------------------------------------------------------
diff --git a/server/base/pom.xml b/server/base/pom.xml
index ea33018..7b11aa1 100644
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@ -118,34 +118,5 @@
         <directory>src/test/resources</directory>
       </testResource>
     </testResources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>license-javadocs</id>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>src/main/javadoc/META-INF/</directory>
-                  <targetPath>META-INF/</targetPath>
-                  <includes>
-                    <include>LICENSE</include>
-                    <include>NOTICE</include>
-                  </includes>
-                  <filtering>true</filtering>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
   </build>
 </project>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/base/src/main/appended-resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/server/base/src/main/appended-resources/META-INF/NOTICE b/server/base/src/main/appended-resources/META-INF/NOTICE
deleted file mode 100644
index a4f1f1a..0000000
--- a/server/base/src/main/appended-resources/META-INF/NOTICE
+++ /dev/null
@@ -1,9 +0,0 @@
-----
-
-This product includes the following work from the Apache Thrift project:
-
-TNonblockingServerSocket.java
-
-Apache Thrift
-Copyright 2006-2010 The Apache Software Foundation.
-

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/base/src/main/javadoc/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/server/base/src/main/javadoc/META-INF/LICENSE b/server/base/src/main/javadoc/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/server/base/src/main/javadoc/META-INF/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/base/src/main/javadoc/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/server/base/src/main/javadoc/META-INF/NOTICE b/server/base/src/main/javadoc/META-INF/NOTICE
deleted file mode 100644
index 3a3fc27..0000000
--- a/server/base/src/main/javadoc/META-INF/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Accumulo
-Copyright 2011-2016 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/monitor/src/main/appended-resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/appended-resources/META-INF/LICENSE b/server/monitor/src/main/appended-resources/META-INF/LICENSE
index 974cb4b..ae202cb 100644
--- a/server/monitor/src/main/appended-resources/META-INF/LICENSE
+++ b/server/monitor/src/main/appended-resources/META-INF/LICENSE
@@ -1,74 +1,70 @@
-----
+**********
 
 APACHE ACCUMULO SUBCOMPONENTS:
 
 The Apache Accumulo project contains subcomponents with separate copyright
 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.
+subcomponents is subject to the terms and conditions of the following licenses.
 
-----
+**********
 
-This product bundles JQuery
+This product includes JQuery:
 
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
+    Copyright 2011, John Resig
+    Dual licensed under the MIT or GPL Version 2 licenses.
+    http://jquery.org/license
 
-Distributed under the MIT License:
+    Includes Sizzle.js
+    http://sizzlejs.com/
+    Copyright 2011, The Dojo Foundation
+    Released under the MIT, BSD, and GPL Licenses.
 
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
+    Distributed under the MIT License:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use,
+    copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following
+    conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-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.
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
 
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    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,
+**********
 
-Copyright (c) 2007-2009 IOLA and Ole Laursen
+This product includes Flot:
 
-Available under the MIT License (see above)
+    Copyright (c) 2007-2009 IOLA and Ole Laursen
 
-Flot bundles additional works:
+    Available under the MIT License (see above)
 
-jquery.pie.js
-* Created by Brian Medendorp, June 2009
-* Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+    Flot bundles additional works:
 
-jquery.flot.resize.js
-* Inline dependency:
- * jQuery resize event - v1.1 - 3/14/2010
- * http://benalman.com/projects/jquery-resize-plugin/
- *
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
+    jquery.pie.js
+    * Created by Brian Medendorp, June 2009
+    * Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
 
-distributed under the MIT license (see above)
+    jquery.flot.resize.js
+    * Inline dependency:
+     * jQuery resize event - v1.1 - 3/14/2010
+     * http://benalman.com/projects/jquery-resize-plugin/
+     *
+     * Copyright (c) 2010 "Cowboy" Ben Alman
+     * Dual licensed under the MIT and GPL licenses.
+     * http://benalman.com/about/license/
 
-For details, see
-  server/src/main/resources/web/flot/
+    distributed under the MIT license (see above)
 
-----
+**********

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/monitor/src/main/javadoc/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/javadoc/META-INF/NOTICE b/server/monitor/src/main/javadoc/META-INF/NOTICE
deleted file mode 100644
index 3a3fc27..0000000
--- a/server/monitor/src/main/javadoc/META-INF/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Accumulo
-Copyright 2011-2016 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/native/src/main/resources/LICENSE
----------------------------------------------------------------------
diff --git a/server/native/src/main/resources/LICENSE b/server/native/src/main/resources/LICENSE
index 6b0b127..d645695 100644
--- a/server/native/src/main/resources/LICENSE
+++ b/server/native/src/main/resources/LICENSE
@@ -200,4 +200,3 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/native/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/server/native/src/main/resources/NOTICE b/server/native/src/main/resources/NOTICE
index 3a3fc27..2316e0f 100644
--- a/server/native/src/main/resources/NOTICE
+++ b/server/native/src/main/resources/NOTICE
@@ -1,4 +1,4 @@
-Apache Accumulo
+Apache Accumulo Native Libraries
 Copyright 2011-2016 The Apache Software Foundation
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/accumulo/blob/dbdba2f9/server/tserver/pom.xml
----------------------------------------------------------------------
diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml
index 5ac1b46..fc1c9fb 100644
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@ -125,34 +125,5 @@
         </plugin>
       </plugins>
     </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>license-javadocs</id>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>src/main/javadoc/META-INF/</directory>
-                  <targetPath>META-INF/</targetPath>
-                  <includes>
-                    <include>LICENSE</include>
-                    <include>NOTICE</include>
-                  </includes>
-                  <filtering>true</filtering>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
   </build>
 </project>


[18/18] accumulo git commit: Merge branch '1.8'

Posted by ct...@apache.org.
Merge branch '1.8'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3a0d0775
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3a0d0775
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3a0d0775

Branch: refs/heads/master
Commit: 3a0d07755e6f02c9e78ab816639cdbc1bc431add
Parents: 29e0ffd 394ad08
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Jul 21 18:47:15 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jul 21 18:47:15 2016 -0400

----------------------------------------------------------------------
 LICENSE                                         | 109 +-
 NOTICE                                          |   7 -
 assemble/bin-LICENSE                            | 989 -------------------
 assemble/bin-NOTICE                             |  18 -
 assemble/pom.xml                                |  17 -
 assemble/src/main/assemblies/component.xml      |  22 +-
 assemble/src/main/resources/LICENSE             | 982 ++++++++++++++++++
 assemble/src/main/resources/NOTICE              |  23 +
 core/pom.xml                                    |  13 +-
 .../main/appended-resources/META-INF/LICENSE    |  71 +-
 examples/simple/pom.xml                         |  12 -
 pom.xml                                         |   3 +-
 server/base/pom.xml                             |  29 -
 .../src/main/appended-resources/META-INF/NOTICE |   9 -
 server/base/src/main/javadoc/META-INF/LICENSE   | 202 ----
 server/base/src/main/javadoc/META-INF/NOTICE    |   5 -
 server/monitor/pom.xml                          |   3 -
 .../main/appended-resources/META-INF/LICENSE    | 100 +-
 server/monitor/src/main/javadoc/META-INF/NOTICE |   5 -
 server/native/src/main/resources/LICENSE        |   1 -
 server/native/src/main/resources/NOTICE         |   2 +-
 server/tserver/pom.xml                          |  32 -
 shell/pom.xml                                   |  17 -
 test/pom.xml                                    |   3 -
 24 files changed, 1165 insertions(+), 1509 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a0d0775/assemble/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a0d0775/core/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a0d0775/examples/simple/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a0d0775/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a0d0775/server/base/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a0d0775/server/monitor/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a0d0775/server/tserver/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a0d0775/shell/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a0d0775/test/pom.xml
----------------------------------------------------------------------