Return-Path: 
 <hadoop-commits-return-1284-apmail-lucene-hadoop-commits-archive=lucene.apache.org@lucene.apache.org>
Delivered-To: apmail-lucene-hadoop-commits-archive@locus.apache.org
Received: (qmail 26178 invoked from network); 6 Mar 2007 21:38:02 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 6 Mar 2007 21:38:02 -0000
Received: (qmail 349 invoked by uid 500); 6 Mar 2007 21:38:11 -0000
Delivered-To: apmail-lucene-hadoop-commits-archive@lucene.apache.org
Received: (qmail 334 invoked by uid 500); 6 Mar 2007 21:38:11 -0000
Mailing-List: contact hadoop-commits-help@lucene.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:hadoop-commits-help@lucene.apache.org>
List-Unsubscribe: <mailto:hadoop-commits-unsubscribe@lucene.apache.org>
List-Post: <mailto:hadoop-commits@lucene.apache.org>
List-Id: <hadoop-commits.lucene.apache.org>
Reply-To: hadoop-dev@lucene.apache.org
Delivered-To: mailing list hadoop-commits@lucene.apache.org
Received: (qmail 324 invoked by uid 99); 6 Mar 2007 21:38:10 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Mar 2007 13:38:10 -0800
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Mar 2007 13:38:01 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7A0FD1A9838; Tue,  6 Mar 2007 13:37:41 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r515311 - in /lucene/hadoop/trunk: CHANGES.txt build.xml
Date: Tue, 06 Mar 2007 21:37:41 -0000
To: hadoop-commits@lucene.apache.org
From: tomwhite@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070306213741.7A0FD1A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>