HIVE-1729. Satisfy ASF release management requirements

(Carl Steinbach via jvs) git-svn-id: https://svn.apache.org/repos/asf/hadoop/hive/trunk@1024432 13f79535-47bb-0310-9956-ffa450edef68
YahooArchive · Oct 19, 2010 · db2de92 · db2de92
1 parent 7b0a1ba
commit db2de92
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 7 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -658,6 +658,9 @@ Release 0.6.0 -  Unreleased
     HIVE-1726. Update README file for 0.6.0 release
     (Carl Steinbach via jvs)
 
+    HIVE-1729. Satisfy ASF release management requirements
+    (Carl Steinbach via jvs)
+
   OPTIMIZATIONS
 
     HIVE-1348. Move inputFileChanged() from ExecMapper to where it is needed

diff --git a/build-common.xml b/build-common.xml
@@ -294,6 +294,7 @@
         <attribute name="Implementation-Version" value="${version}"/>
         <attribute name="Implementation-Vendor" value="Apache"/>
       </manifest>
+      <metainf dir="${hive.root}" includes="LICENSE,NOTICE"/>
     </jar>
   </target>
 

diff --git a/build.xml b/build.xml
@@ -328,6 +328,9 @@
       <fileset dir="${test.data.dir}/files" includes="*.*" excludes="${vcs.excludes}"/>
     </copy>
     <copy file="${basedir}/README.txt" todir="${target.dir}"/>
+    <copy file="${basedir}/NOTICE" todir="${target.dir}"/>
+    <copy file="${basedir}/LICENSE" todir="${target.dir}"/>
+    <copy file="${basedir}/RELEASE_NOTES.txt" todir="${target.dir}"/>
     <copy todir="${target.example.dir}/queries" preservelastmodified="true" flatten="true">
       <fileset dir="${ql.test.query.dir}/positive" includes="*.q" excludes="${vcs.excludes}"/>
     </copy>
@@ -518,7 +521,8 @@
     </macro_tar>
   </target>
 
-  <target name="binary" depends="package, docs, javadoc" description="Make tarball without source and documentation">
+  <target name="binary" depends="package, docs, javadoc"
+          description="Make release tarball without source and documentation">
     <macro_tar param.destfile="${build.dir.hive}/${bin.final.name}.tar.gz">
       <param.listofitems>
         <tarfileset dir="${build.dir.hive}/dist" mode="755" prefix="${bin.final.name}"

diff --git a/contrib/build.xml b/contrib/build.xml
@@ -121,6 +121,7 @@
         <attribute name="Implementation-Version" value="${version}"/>
         <attribute name="Implementation-Vendor" value="Apache"/>
       </manifest>
+      <metainf dir="${hive.root}" includes="LICENSE,NOTICE"/>
     </jar>
   </target>
 

diff --git a/hbase-handler/build.xml b/hbase-handler/build.xml
@@ -99,6 +99,7 @@
         <attribute name="Implementation-Version" value="${version}"/>
         <attribute name="Implementation-Vendor" value="Apache"/>
       </manifest>
+      <metainf dir="${hive.root}" includes="LICENSE,NOTICE"/>
     </jar>
   </target>
 

diff --git a/hwi/build.xml b/hwi/build.xml
@@ -44,7 +44,16 @@
 
   <!--hive_hwi.war file contains only the JSP sources -->
   <target name="war">
-    <jar jarfile="${build.dir.hive}/hwi/hive-hwi-${version}.war" basedir="${basedir}/web"/>
+    <jar jarfile="${build.dir.hive}/hwi/hive-hwi-${version}.war" basedir="${basedir}/web">
+      <manifest>
+        <!-- Not putting these in their own manifest section, since that inserts
+             a new-line, which breaks the reading of the attributes. -->
+        <attribute name="Implementation-Title" value="Hive"/>
+        <attribute name="Implementation-Version" value="${version}"/>
+        <attribute name="Implementation-Vendor" value="Apache"/>
+      </manifest>
+      <metainf dir="${hive.root}" includes="LICENSE,NOTICE"/>
+    </jar>
   </target>
 
   <!-- Compile is a clone of the build-common.xml compile, with one exception:

diff --git a/lib/json-LICENSE.txt b/lib/json-LICENSE.txt
@@ -1,9 +1,22 @@
 Copyright (c) 2002 JSON.org
 
-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 shall be used for Good, not Evil.
 
-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.
diff --git a/metastore/build.xml b/metastore/build.xml
@@ -100,8 +100,16 @@
     <jar
       jarfile="${build.dir}/${name}-model-${version}.jar"
       basedir="${build.classes}"
-      includes="**/model/M*"
-    />
+      includes="**/model/M*">
+      <manifest>
+        <!-- Not putting these in their own manifest section, since that inserts
+             a new-line, which breaks the reading of the attributes. -->
+        <attribute name="Implementation-Title" value="Hive"/>
+        <attribute name="Implementation-Version" value="${version}"/>
+        <attribute name="Implementation-Vendor" value="Apache"/>
+      </manifest>
+      <metainf dir="${hive.root}" includes="LICENSE,NOTICE"/>
+    </jar>
   </target>
 
   <target name="generate-schema">

diff --git a/ql/build.xml b/ql/build.xml
@@ -193,6 +193,14 @@
       <fileset dir="${build.dir.hive}/commons-lang/classes" includes="**/StringUtils.class,**/WordUtils.class"/>
       <fileset dir="${build.dir.hive}/json/classes" includes="**/*.class"/>
       <fileset dir="${build.dir.hive}/shims/classes" includes="**/*.class"/>
+      <manifest>
+        <!-- Not putting these in their own manifest section, since that inserts
+             a new-line, which breaks the reading of the attributes. -->
+        <attribute name="Implementation-Title" value="Hive"/>
+        <attribute name="Implementation-Version" value="${version}"/>
+        <attribute name="Implementation-Vendor" value="Apache"/>
+      </manifest>
+      <metainf dir="${hive.root}" includes="LICENSE,NOTICE"/>
     </jar>
   </target>