accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [02/18] accumulo git commit: ACCUMULO-4382 Clean up license/notice files
Date Thu, 21 Jul 2016 22:48:58 GMT
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 <ctubbsii@apache.org>
Authored: Thu Jul 21 17:00:26 2016 -0400
Committer: Christopher Tubbs <ctubbsii@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>


Mime
View raw message