Author: cutting
Date: Wed Aug 22 10:13:08 2007
New Revision: 568706
URL: http://svn.apache.org/viewvc?rev=568706&view=rev
Log:
HADOOP-1731. Add Hadoop's version number to contrib jar file names.
Modified:
lucene/hadoop/trunk/CHANGES.txt
lucene/hadoop/trunk/build.xml
lucene/hadoop/trunk/src/contrib/abacus/build.xml
lucene/hadoop/trunk/src/contrib/build-contrib.xml
lucene/hadoop/trunk/src/contrib/data_join/build.xml
lucene/hadoop/trunk/src/contrib/eclipse-plugin/build.xml
lucene/hadoop/trunk/src/contrib/hbase/build.xml
lucene/hadoop/trunk/src/contrib/streaming/build.xml
Modified: lucene/hadoop/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?rev=568706&r1=568705&r2=568706&view=diff
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Wed Aug 22 10:13:08 2007
@@ -75,6 +75,9 @@
class, with specialized subclasses for directories and files, to
save memory on the namenode. (Konstantin Shvachko via cutting)
+ HADOOP-1731. Add Hadoop's version to contrib jar file names.
+ (cutting)
+
Release 0.14.0 - 2007-08-17
Modified: lucene/hadoop/trunk/build.xml
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/build.xml?rev=568706&r1=568705&r2=568706&view=diff
==============================================================================
--- lucene/hadoop/trunk/build.xml (original)
+++ lucene/hadoop/trunk/build.xml Wed Aug 22 10:13:08 2007
@@ -302,6 +302,7 @@
<target name="compile-contrib" depends="compile-core">
<subant target="deploy">
+ <property name="version" value="${version}"/>
<fileset file="${contrib.dir}/build.xml"/>
</subant>
</target>
@@ -568,7 +569,7 @@
<sourcePath path="${basedir}/src/contrib/streaming/src/java" />
<class location="${basedir}/build/hadoop-${version}-core.jar" />
<class location="${basedir}/build/hadoop-${version}-examples.jar" />
- <class location="${basedir}/build/hadoop-streaming.jar" />
+ <class location="${basedir}/build/hadoop-${version}-streaming.jar" />
</findbugs>
<xslt style="${findbugs.home}/src/xsl/default.xsl"
Modified: lucene/hadoop/trunk/src/contrib/abacus/build.xml
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/abacus/build.xml?rev=568706&r1=568705&r2=568706&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/abacus/build.xml (original)
+++ lucene/hadoop/trunk/src/contrib/abacus/build.xml Wed Aug 22 10:13:08 2007
@@ -11,7 +11,7 @@
<!-- Override jar target to specify main class -->
<target name="jar" depends="compile">
<jar
- jarfile="${build.dir}/hadoop-${name}.jar"
+ jarfile="${build.dir}/hadoop-${version}-${name}.jar"
basedir="${build.classes}"
>
<manifest>
Modified: lucene/hadoop/trunk/src/contrib/build-contrib.xml
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/build-contrib.xml?rev=568706&r1=568705&r2=568706&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/build-contrib.xml (original)
+++ lucene/hadoop/trunk/src/contrib/build-contrib.xml Wed Aug 22 10:13:08 2007
@@ -136,7 +136,7 @@
<target name="jar" depends="compile" unless="skip.contrib">
<echo message="contrib: ${name}"/>
<jar
- jarfile="${build.dir}/hadoop-${name}.jar"
+ jarfile="${build.dir}/hadoop-${version}-${name}.jar"
basedir="${build.classes}"
/>
</target>
@@ -148,7 +148,7 @@
<target name="jar-examples" depends="compile-examples"
if="examples.available" unless="skip.contrib">
<echo message="contrib: ${name}"/>
- <jar jarfile="${build.dir}/hadoop-${name}-examples.jar">
+ <jar jarfile="${build.dir}/hadoop-${version}-${name}-examples.jar">
<fileset dir="${build.classes}">
</fileset>
<fileset dir="${build.examples}">
@@ -159,7 +159,8 @@
<target name="deploy" depends="jar, jar-examples" unless="skip.contrib">
<echo message="contrib: ${name}"/>
<mkdir dir="${deploy.dir}"/>
- <copy file="${build.dir}/hadoop-${name}.jar" todir="${deploy.dir}"/>
+ <copy file="${build.dir}/hadoop-${version}-${name}.jar"
+ todir="${deploy.dir}"/>
<!-- <copy todir="${deploy.dir}" flatten="true">
<fileset refid="lib.jars"/>
</copy> -->
Modified: lucene/hadoop/trunk/src/contrib/data_join/build.xml
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/data_join/build.xml?rev=568706&r1=568705&r2=568706&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/data_join/build.xml (original)
+++ lucene/hadoop/trunk/src/contrib/data_join/build.xml Wed Aug 22 10:13:08 2007
@@ -11,7 +11,7 @@
<!-- Override jar target to specify main class -->
<target name="jar" depends="compile">
<jar
- jarfile="${build.dir}/hadoop-${name}.jar"
+ jarfile="${build.dir}/hadoop-${version}-${name}.jar"
basedir="${build.classes}"
>
<manifest>
Modified: lucene/hadoop/trunk/src/contrib/eclipse-plugin/build.xml
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/eclipse-plugin/build.xml?rev=568706&r1=568705&r2=568706&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/eclipse-plugin/build.xml (original)
+++ lucene/hadoop/trunk/src/contrib/eclipse-plugin/build.xml Wed Aug 22
10:13:08 2007
@@ -35,7 +35,7 @@
<!-- Override jar target to specify manifest -->
<target name="jar" depends="compile" unless="skip.contrib">
<jar
- jarfile="${build.dir}/hadoop-${name}.jar"
+ jarfile="${build.dir}/hadoop-${version}-${name}.jar"
manifest="${root}/META-INF/MANIFEST.MF">
<fileset dir="${build.dir}" includes="classes/"/>
<fileset dir="${root}" includes="resources/ plugin.xml"/>
Modified: lucene/hadoop/trunk/src/contrib/hbase/build.xml
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/build.xml?rev=568706&r1=568705&r2=568706&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/build.xml (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/build.xml Wed Aug 22 10:13:08 2007
@@ -55,7 +55,7 @@
<!-- Override jar target to specify main class -->
<target name="jar" depends="compile">
<jar
- jarfile="${build.dir}/hadoop-${name}.jar"
+ jarfile="${build.dir}/hadoop-${version}-${name}.jar"
basedir="${build.classes}"
/>
</target>
@@ -73,7 +73,7 @@
debug="${javac.debug}">
<classpath refid="test.classpath"/>
</javac>
- <jar jarfile="${build.dir}/hadoop-${name}-test.jar" >
+ <jar jarfile="${build.dir}/hadoop-${version}-${name}-test.jar" >
<fileset dir="${build.test}" includes="org/**" />
<fileset dir="${build.classes}" />
<fileset dir="${src.test}" includes="**/*.properties" />
Modified: lucene/hadoop/trunk/src/contrib/streaming/build.xml
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/streaming/build.xml?rev=568706&r1=568705&r2=568706&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/streaming/build.xml (original)
+++ lucene/hadoop/trunk/src/contrib/streaming/build.xml Wed Aug 22 10:13:08 2007
@@ -11,7 +11,7 @@
<!-- Override jar target to specify main class -->
<target name="jar" depends="compile">
<jar
- jarfile="${build.dir}/hadoop-${name}.jar"
+ jarfile="${build.dir}/hadoop-${version}-${name}.jar"
basedir="${build.classes}"
>
<manifest>
