You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by to...@apache.org on 2007/03/06 22:37:41 UTC
svn commit: r515311 - in /lucene/hadoop/trunk: CHANGES.txt build.xml
Author: tomwhite
Date: Tue Mar 6 13:37:40 2007
New Revision: 515311
URL: http://svn.apache.org/viewvc?view=rev&rev=515311
Log:
HADOOP-1067. Compile fails if Checkstyle jar is present in lib directory
Modified:
lucene/hadoop/trunk/CHANGES.txt
lucene/hadoop/trunk/build.xml
Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=515311&r1=515310&r2=515311
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Tue Mar 6 13:37:40 2007
@@ -11,6 +11,9 @@
the record package and improve some record documentation.
(Milind Bhandarkar via cutting)
+ 3. HADOOP-1067. Compile fails if Checkstyle jar is present in lib
+ directory. Also remove dependency on a particular Checkstyle
+ version number. (tomwhite)
Release 0.12.0 - 2007-03-02
Modified: lucene/hadoop/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/build.xml?view=diff&rev=515311&r1=515310&r2=515311
==============================================================================
--- lucene/hadoop/trunk/build.xml (original)
+++ lucene/hadoop/trunk/build.xml Tue Mar 6 13:37:40 2007
@@ -73,6 +73,7 @@
<pathelement location="${build.classes}"/>
<fileset dir="${lib.dir}">
<include name="**/*.jar" />
+ <exclude name="**/excluded/" />
</fileset>
<pathelement location="${conf.dir}"/>
</path>
@@ -468,8 +469,13 @@
</target>
<target name="checkstyle" depends="check-for-checkstyle" if="checkstyle.present">
- <taskdef resource="checkstyletask.properties"
- classpath="${lib.dir}/checkstyle-all-4.3.jar"/>
+ <taskdef resource="checkstyletask.properties">
+ <classpath>
+ <fileset dir="${lib.dir}">
+ <include name="excluded/checkstyle-all-*.jar"/>
+ </fileset>
+ </classpath>
+ </taskdef>
<mkdir dir="${test.build.dir}"/>
@@ -485,8 +491,12 @@
</target>
<target name="check-for-checkstyle">
- <available property="checkstyle.present"
- file="${lib.dir}/checkstyle-all-4.3.jar">
+ <available property="checkstyle.present" resource="checkstyletask.properties">
+ <classpath>
+ <fileset dir="${lib.dir}">
+ <include name="excluded/checkstyle-all-*.jar"/>
+ </fileset>
+ </classpath>
</available>
</target>