You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jv...@apache.org on 2010/10/20 00:19:58 UTC
svn commit: r1024432 - in /hadoop/hive/trunk: CHANGES.txt build-common.xml
build.xml contrib/build.xml hbase-handler/build.xml hwi/build.xml
lib/json-LICENSE.txt metastore/build.xml ql/build.xml
Author: jvs
Date: Tue Oct 19 22:19:58 2010
New Revision: 1024432
URL: http://svn.apache.org/viewvc?rev=1024432&view=rev
Log:
HIVE-1729. Satisfy ASF release management requirements
(Carl Steinbach via jvs)
Modified:
hadoop/hive/trunk/CHANGES.txt
hadoop/hive/trunk/build-common.xml
hadoop/hive/trunk/build.xml
hadoop/hive/trunk/contrib/build.xml
hadoop/hive/trunk/hbase-handler/build.xml
hadoop/hive/trunk/hwi/build.xml
hadoop/hive/trunk/lib/json-LICENSE.txt
hadoop/hive/trunk/metastore/build.xml
hadoop/hive/trunk/ql/build.xml
Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=1024432&r1=1024431&r2=1024432&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Tue Oct 19 22:19:58 2010
@@ -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
Modified: hadoop/hive/trunk/build-common.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/build-common.xml?rev=1024432&r1=1024431&r2=1024432&view=diff
==============================================================================
--- hadoop/hive/trunk/build-common.xml (original)
+++ hadoop/hive/trunk/build-common.xml Tue Oct 19 22:19:58 2010
@@ -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>
Modified: hadoop/hive/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/build.xml?rev=1024432&r1=1024431&r2=1024432&view=diff
==============================================================================
--- hadoop/hive/trunk/build.xml (original)
+++ hadoop/hive/trunk/build.xml Tue Oct 19 22:19:58 2010
@@ -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}"
Modified: hadoop/hive/trunk/contrib/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/contrib/build.xml?rev=1024432&r1=1024431&r2=1024432&view=diff
==============================================================================
--- hadoop/hive/trunk/contrib/build.xml (original)
+++ hadoop/hive/trunk/contrib/build.xml Tue Oct 19 22:19:58 2010
@@ -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>
Modified: hadoop/hive/trunk/hbase-handler/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/hbase-handler/build.xml?rev=1024432&r1=1024431&r2=1024432&view=diff
==============================================================================
--- hadoop/hive/trunk/hbase-handler/build.xml (original)
+++ hadoop/hive/trunk/hbase-handler/build.xml Tue Oct 19 22:19:58 2010
@@ -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>
Modified: hadoop/hive/trunk/hwi/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/hwi/build.xml?rev=1024432&r1=1024431&r2=1024432&view=diff
==============================================================================
--- hadoop/hive/trunk/hwi/build.xml (original)
+++ hadoop/hive/trunk/hwi/build.xml Tue Oct 19 22:19:58 2010
@@ -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:
Modified: hadoop/hive/trunk/lib/json-LICENSE.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/lib/json-LICENSE.txt?rev=1024432&r1=1024431&r2=1024432&view=diff
==============================================================================
--- hadoop/hive/trunk/lib/json-LICENSE.txt (original)
+++ hadoop/hive/trunk/lib/json-LICENSE.txt Tue Oct 19 22:19:58 2010
@@ -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.
Modified: hadoop/hive/trunk/metastore/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/metastore/build.xml?rev=1024432&r1=1024431&r2=1024432&view=diff
==============================================================================
--- hadoop/hive/trunk/metastore/build.xml (original)
+++ hadoop/hive/trunk/metastore/build.xml Tue Oct 19 22:19:58 2010
@@ -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">
Modified: hadoop/hive/trunk/ql/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/build.xml?rev=1024432&r1=1024431&r2=1024432&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/build.xml (original)
+++ hadoop/hive/trunk/ql/build.xml Tue Oct 19 22:19:58 2010
@@ -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>