You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by gs...@apache.org on 2008/01/25 21:27:55 UTC
svn commit: r615329 - in /lucene/java/trunk: CHANGES.txt build.xml
common-build.xml contrib/contrib-build.xml lib/ lib/junit-3.8.2.jar
Author: gsingers
Date: Fri Jan 25 12:27:55 2008
New Revision: 615329
URL: http://svn.apache.org/viewvc?rev=615329&view=rev
Log:
LUCENE-1153: added lib/junit and build support
Added:
lucene/java/trunk/lib/
lucene/java/trunk/lib/junit-3.8.2.jar (with props)
Modified:
lucene/java/trunk/CHANGES.txt
lucene/java/trunk/build.xml
lucene/java/trunk/common-build.xml
lucene/java/trunk/contrib/contrib-build.xml
Modified: lucene/java/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/trunk/CHANGES.txt?rev=615329&r1=615328&r2=615329&view=diff
==============================================================================
--- lucene/java/trunk/CHANGES.txt (original)
+++ lucene/java/trunk/CHANGES.txt Fri Jan 25 12:27:55 2008
@@ -1,4 +1,4 @@
-Lucene Change Log
+Lucene Change Log
$Id$
======================= Trunk (not yet released) =======================
@@ -39,6 +39,8 @@
Documentation
Build
+
+ 1. LUCENE-1153: Added JUnit JAR to new lib directory. Updated build to rely on local JUnit instead of ANT/lib.
Test Cases
Modified: lucene/java/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/build.xml?rev=615329&r1=615328&r2=615329&view=diff
==============================================================================
--- lucene/java/trunk/build.xml (original)
+++ lucene/java/trunk/build.xml Fri Jan 25 12:27:55 2008
@@ -40,14 +40,16 @@
<path refid="classpath"/>
<pathelement location="${build.dir}/classes/demo"/>
</path>
-
+
<path id="test.classpath">
<path refid="demo.classpath"/>
+ <path refid="junit-path"/>
<pathelement location="${build.dir}/classes/test"/>
</path>
<path id="junit.classpath">
+ <path refid="junit-path"/>
<pathelement location="${build.dir}/classes/test"/>
<pathelement location="${build.dir}/classes/java"/>
<pathelement location="${build.dir}/classes/demo"/>
Modified: lucene/java/trunk/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/common-build.xml?rev=615329&r1=615328&r2=615329&view=diff
==============================================================================
--- lucene/java/trunk/common-build.xml (original)
+++ lucene/java/trunk/common-build.xml Fri Jan 25 12:27:55 2008
@@ -45,6 +45,12 @@
<property name="year" value="2000-${current.year}"/>
<property name="final.name" value="lucene-${name}-${version}"/>
+ <property name="junit.jar" value="junit-3.8.2.jar"/>
+ <property name="junit-location.jar" value="${common.dir}/lib/${junit.jar}"/>
+ <path id="junit-path">
+ <pathelement location="${junit-location.jar}"/>
+ </path>
+
<property name="javac.deprecation" value="off"/>
<property name="javac.debug" value="on"/>
<property name="javac.source" value="1.4"/>
@@ -111,11 +117,6 @@
/>
<available
- property="junit.present"
- classname="junit.framework.TestCase"
- />
-
- <available
property="maven.ant.tasks.present"
classname="org.apache.maven.artifact.ant.Pom"
/>
@@ -334,13 +335,6 @@
<property name="tests.verbose" value="false"/>
<target name="test" depends="compile-test" description="Runs unit tests">
- <fail unless="junit.present">
- ##################################################################
- JUnit not found.
- Please make sure junit.jar is in ANT_HOME/lib, or made available
- to Ant using other mechanisms like -lib or CLASSPATH.
- ##################################################################
- </fail>
<mkdir dir="${junit.output.dir}"/>
<junit printsummary="off" haltonfailure="no"
errorProperty="tests.failed" failureProperty="tests.failed">
Modified: lucene/java/trunk/contrib/contrib-build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/contrib-build.xml?rev=615329&r1=615328&r2=615329&view=diff
==============================================================================
--- lucene/java/trunk/contrib/contrib-build.xml (original)
+++ lucene/java/trunk/contrib/contrib-build.xml Fri Jan 25 12:27:55 2008
@@ -41,7 +41,7 @@
<path id="test.classpath">
<path refid="classpath"/>
<pathelement location="../../build/classes/test/"/>
- <pathelement location="${junit.jar}"/>
+ <path refid="junit-path"/>
<pathelement location="${build.dir}/classes/java"/>
</path>
Added: lucene/java/trunk/lib/junit-3.8.2.jar
URL: http://svn.apache.org/viewvc/lucene/java/trunk/lib/junit-3.8.2.jar?rev=615329&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/java/trunk/lib/junit-3.8.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream