commit 62f8d87eab70bf734e029ade236babf08d72232c
author Hitesh Shah <hitesh@apache.org> Fri Nov 06 21:10:19 2015 -0800
committer Hitesh Shah <hitesh@apache.org> Fri Nov 06 21:10:19 2015 -0800
tree 3089d688f1f591a699a58e677a495c4a1184d61d
parent 8e35e498ea14342c72b2aaa77556987f9bc3d006

TEZ-2595. Add license and notice files into assembled full and minimal tarballs. (hitesh)

tez-dist/dist-files/full/LICENSE

diff --git a/tez-dist/dist-files/full/LICENSE b/tez-dist/dist-files/full/LICENSE
index 40aafbf..3cff5fc 100644
--- a/tez-dist/dist-files/full/LICENSE
+++ b/tez-dist/dist-files/full/LICENSE
@@ -300,6 +300,8 @@
   - jaxb-impl-*.jar
   - servlet-api-*.jar
 
+The text for this license can be found in the LICENSE-CDDLv1.1-GPLv2_withCPE file.
+
 -----------------------------------------------------------------------
  BSD-style Licenses
 ( 3-clause BSD License - http://opensource.org/licenses/BSD-3-Clause )

tez-dist/dist-files/full/LICENSE-BSD-3clause

diff --git a/tez-dist/dist-files/additional_licenses/LICENSE-BSD-3clause b/tez-dist/dist-files/full/LICENSE-BSD-3clause
similarity index 100%
rename from tez-dist/dist-files/additional_licenses/LICENSE-BSD-3clause
rename to tez-dist/dist-files/full/LICENSE-BSD-3clause

tez-dist/dist-files/full/LICENSE-CDDLv1.0

diff --git a/tez-dist/dist-files/additional_licenses/LICENSE-CDDLv1.0 b/tez-dist/dist-files/full/LICENSE-CDDLv1.0
similarity index 100%
rename from tez-dist/dist-files/additional_licenses/LICENSE-CDDLv1.0
rename to tez-dist/dist-files/full/LICENSE-CDDLv1.0

tez-dist/dist-files/full/LICENSE-CDDLv1.1-GPLv2_withCPE

diff --git a/tez-dist/dist-files/additional_licenses/LICENSE-CDDLv1.1-GPLv2_withCPE b/tez-dist/dist-files/full/LICENSE-CDDLv1.1-GPLv2_withCPE
similarity index 100%
rename from tez-dist/dist-files/additional_licenses/LICENSE-CDDLv1.1-GPLv2_withCPE
rename to tez-dist/dist-files/full/LICENSE-CDDLv1.1-GPLv2_withCPE

tez-dist/dist-files/full/LICENSE-MIT

diff --git a/tez-dist/dist-files/additional_licenses/LICENSE-MIT b/tez-dist/dist-files/full/LICENSE-MIT
similarity index 100%
rename from tez-dist/dist-files/additional_licenses/LICENSE-MIT
rename to tez-dist/dist-files/full/LICENSE-MIT

tez-dist/dist-files/full/LICENSE-SIL_OpenFontLicense-v1.1

diff --git a/tez-dist/dist-files/additional_licenses/LICENSE-SIL_OpenFontLicense-v1.1 b/tez-dist/dist-files/full/LICENSE-SIL_OpenFontLicense-v1.1
similarity index 100%
rename from tez-dist/dist-files/additional_licenses/LICENSE-SIL_OpenFontLicense-v1.1
rename to tez-dist/dist-files/full/LICENSE-SIL_OpenFontLicense-v1.1

tez-dist/dist-files/minimal/LICENSE-BSD-3clause

diff --git a/tez-dist/dist-files/additional_licenses/LICENSE-BSD-3clause b/tez-dist/dist-files/minimal/LICENSE-BSD-3clause
similarity index 100%
copy from tez-dist/dist-files/additional_licenses/LICENSE-BSD-3clause
copy to tez-dist/dist-files/minimal/LICENSE-BSD-3clause

tez-dist/dist-files/minimal/LICENSE-CDDLv1.1-GPLv2_withCPE

diff --git a/tez-dist/dist-files/additional_licenses/LICENSE-CDDLv1.1-GPLv2_withCPE b/tez-dist/dist-files/minimal/LICENSE-CDDLv1.1-GPLv2_withCPE
similarity index 100%
copy from tez-dist/dist-files/additional_licenses/LICENSE-CDDLv1.1-GPLv2_withCPE
copy to tez-dist/dist-files/minimal/LICENSE-CDDLv1.1-GPLv2_withCPE

tez-dist/dist-files/minimal/LICENSE-MIT

diff --git a/tez-dist/dist-files/additional_licenses/LICENSE-MIT b/tez-dist/dist-files/minimal/LICENSE-MIT
similarity index 100%
copy from tez-dist/dist-files/additional_licenses/LICENSE-MIT
copy to tez-dist/dist-files/minimal/LICENSE-MIT

tez-dist/dist-files/minimal/LICENSE-SIL_OpenFontLicense-v1.1

diff --git a/tez-dist/dist-files/additional_licenses/LICENSE-SIL_OpenFontLicense-v1.1 b/tez-dist/dist-files/minimal/LICENSE-SIL_OpenFontLicense-v1.1
similarity index 100%
copy from tez-dist/dist-files/additional_licenses/LICENSE-SIL_OpenFontLicense-v1.1
copy to tez-dist/dist-files/minimal/LICENSE-SIL_OpenFontLicense-v1.1

tez-dist/src/main/assembly/tez-dist-minimal.xml

diff --git a/tez-dist/src/main/assembly/tez-dist-minimal.xml b/tez-dist/src/main/assembly/tez-dist-minimal.xml
index 60aa50e..d0ed55b 100644
--- a/tez-dist/src/main/assembly/tez-dist-minimal.xml
+++ b/tez-dist/src/main/assembly/tez-dist-minimal.xml
@@ -45,4 +45,13 @@
       </binaries>
     </moduleSet>
   </moduleSets>
+  <fileSets>
+    <fileSet>
+      <directory>dist-files/minimal/</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>**</include>
+      </includes>
+    </fileSet>
+  </fileSets>
 </assembly>

tez-dist/src/main/assembly/tez-dist.xml

diff --git a/tez-dist/src/main/assembly/tez-dist.xml b/tez-dist/src/main/assembly/tez-dist.xml
index 9b2aa04..a181546 100644
--- a/tez-dist/src/main/assembly/tez-dist.xml
+++ b/tez-dist/src/main/assembly/tez-dist.xml
@@ -39,4 +39,13 @@
       </binaries>
     </moduleSet>
   </moduleSets>
+  <fileSets>
+    <fileSet>
+      <directory>dist-files/full/</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>**</include>
+      </includes>
+    </fileSet>
+  </fileSets>
 </assembly>