HADOOP-15958. Revisiting LICENSE and NOTICE files.

This closes #1307

Reviewed-by: Masatake Iwasaki <[email protected]>

Author: aajisaka

LICENSE-binary

@@ -4,30 +4,4 @@ For the latest information about Hadoop, please visit our website at:
 
 and our wiki, at:
 
-   http://wiki.apache.org/hadoop/
-
-This distribution includes cryptographic software.  The country in 
-which you currently reside may have restrictions on the import, 
-possession, use, and/or re-export to another country, of 
-encryption software.  BEFORE using any encryption software, please 
-check your country's laws, regulations and policies concerning the
-import, possession, or use, and re-export of encryption software, to 
-see if this is permitted.  See <http://www.wassenaar.org/> for more
-information.
-
-The U.S. Government Department of Commerce, Bureau of Industry and
-Security (BIS), has classified this software as Export Commodity 
-Control Number (ECCN) 5D002.C.1, which includes information security
-software using or performing cryptographic functions with asymmetric
-algorithms.  The form and manner of this Apache Software Foundation
-distribution makes it eligible for export under the License Exception
-ENC Technology Software Unrestricted (TSU) exception (see the BIS 
-Export Administration Regulations, Section 740.13) for both object 
-code and source code.
-
-The following provides more details on the included cryptographic
-software:
-  Hadoop Core uses the SSL libraries from the Jetty project written 
-by mortbay.org.
-  Hadoop Yarn Server Web Proxy uses the BouncyCastle Java
-cryptography APIs written by the Legion of the Bouncy Castle Inc.
+   https://cwiki.apache.org/confluence/display/HADOOP/

LICENSE.txt

@@ -122,6 +122,10 @@ run mkdir "hadoop-${VERSION}"
 run cd "hadoop-${VERSION}"
 run cp -p "${ROOT}/LICENSE.txt" .
 run cp -p "${ROOT}/NOTICE.txt" .
+run cp -p "${ROOT}/LICENSE-binary" .
+run mkdir licenses-binary
+run cp -p "${ROOT}/licenses-binary"/* licenses-binary/
+run cp -p "${ROOT}/NOTICE-binary" .
 run cp -p "${ROOT}/README.txt" .
 
 # Copy hadoop-common first so that it have always have all dependencies.

NOTICE-binary

@@ -131,6 +131,19 @@
       </includes>
       <outputDirectory>/include</outputDirectory>
     </fileSet>
+    <fileSet>
+      <directory>.</directory>
+      <includes>
+        <include>LICENSE-binary</include>
+        <include>NOTICE-binary</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>./license-binary</directory>
+      <includes>
+        <include>*</include>
+      </includes>
+    </fileSet>
   </fileSets>
   <dependencySets>
     <dependencySet>

NOTICE.txt

@@ -31,6 +31,12 @@
         <include>NOTICE.txt</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>./licenses</directory>
+      <includes>
+        <include>*</include>
+      </includes>
+    </fileSet>
     <fileSet>
       <directory>.</directory>
       <useDefaultExcludes>true</useDefaultExcludes>

README.txt

@@ -124,7 +124,6 @@
           <excludes>
             <exclude>src/main/data/2jobs2min-rumen-jh.json</exclude>
             <exclude>src/main/html/js/thirdparty/jquery.js</exclude>
-            <exclude>src/main/html/js/thirdparty/d3-LICENSE</exclude>
             <exclude>src/main/html/js/thirdparty/d3.v3.js</exclude>
             <exclude>src/main/html/simulate.html.template</exclude>
             <exclude>src/main/html/simulate.info.html.template</exclude>

dev-support/bin/dist-layout-stitching

@@ -0,0 +1,16 @@
+The MIT License (MIT)
+Copyright (c) 2014 Konstantin Skipor
+
+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.