You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2012/06/26 13:49:14 UTC
svn commit: r1353970 - in /lucene/dev/branches/branch_4x: build.xml
lucene/CHANGES.txt lucene/common-build.xml lucene/test-framework/ivy.xml
Author: dweiss
Date: Tue Jun 26 11:49:13 2012
New Revision: 1353970
URL: http://svn.apache.org/viewvc?rev=1353970&view=rev
Log:
LUCENE-4115: JAR resolution/ cleanup should be done automatically for ant clean/ eclipse/ resolve.
Modified:
lucene/dev/branches/branch_4x/build.xml
lucene/dev/branches/branch_4x/lucene/CHANGES.txt
lucene/dev/branches/branch_4x/lucene/common-build.xml
lucene/dev/branches/branch_4x/lucene/test-framework/ivy.xml
Modified: lucene/dev/branches/branch_4x/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/build.xml?rev=1353970&r1=1353969&r2=1353970&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/build.xml (original)
+++ lucene/dev/branches/branch_4x/build.xml Tue Jun 26 11:49:13 2012
@@ -65,7 +65,7 @@
</subant></sequential>
</target>
- <target name="resolve" description="Resolves all dependencies">
+ <target name="resolve" depends="clean-jars" description="Resolves all dependencies">
<sequential><subant target="resolve" inheritall="false" failonerror="true">
<fileset dir="lucene" includes="build.xml" />
<fileset dir="solr" includes="build.xml" />
@@ -116,7 +116,7 @@
</sequential>
</target>
- <target name="eclipse" description="Setup Eclipse configuration" depends="resolve">
+ <target name="eclipse" depends="clean-jars, resolve" description="Setup Eclipse configuration">
<copy file="dev-tools/eclipse/dot.project" tofile=".project" overwrite="false"/>
<copy file="dev-tools/eclipse/dot.classpath" tofile=".classpath" overwrite="true"/>
<mkdir dir=".settings"/>
@@ -129,7 +129,7 @@
</echo>
</target>
- <target name="idea" description="Setup IntelliJ IDEA configuration" depends="resolve">
+ <target name="idea" depends="clean-jars, resolve" description="Setup IntelliJ IDEA configuration">
<copy todir=".">
<fileset dir="dev-tools/idea"/>
</copy>
@@ -138,6 +138,7 @@
File | Project Structure | Project | Project SDK.
</echo>
</target>
+
<target name="clean-idea"
description="Removes all IntelliJ IDEA configuration files">
<delete dir=".idea" failonerror="true"/>
@@ -148,7 +149,7 @@
</delete>
</target>
- <target name="clean" description="Clean Lucene and Solr">
+ <target name="clean" depends="clean-jars" description="Clean Lucene and Solr">
<delete dir="dist" />
<sequential>
<subant target="clean" inheritall="false" failonerror="true">
Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1353970&r1=1353969&r2=1353970&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Tue Jun 26 11:49:13 2012
@@ -1077,6 +1077,9 @@ Documentation
Build
+* LUCENE-4115: JAR resolution/ cleanup should be done automatically for ant
+ clean/ eclipse/ resolve (Dawid Weiss)
+
* LUCENE-4047: Cleanup of LuceneTestCase: moved blocks of initialization/ cleanup
code into JUnit instance and class rules. (Dawid Weiss)
Modified: lucene/dev/branches/branch_4x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/common-build.xml?rev=1353970&r1=1353969&r2=1353970&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Tue Jun 26 11:49:13 2012
@@ -1019,13 +1019,11 @@ ${tests-output}/junit4-*.suites - pe
<target name="install-junit4-taskdef">
<!-- JUnit4 taskdef. -->
+ <ivy:resolve file="${common.dir}/test-framework/ivy.xml" type="jar" log="quiet" />
+ <ivy:cachepath file="${common.dir}/test-framework/ivy.xml" conf="junit4-stdalone" type="jar" transitive="false" pathid="path.junit4" />
+
<taskdef resource="com/carrotsearch/junit4/antlib.xml">
- <classpath>
- <fileset dir="${common.dir}/test-framework/lib">
- <include name="junit4-ant-*.jar" />
- <include name="junit-*.jar" />
- </fileset>
- </classpath>
+ <classpath refid="path.junit4" />
</taskdef>
</target>
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/ivy.xml?rev=1353970&r1=1353969&r2=1353970&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/ivy.xml Tue Jun 26 11:49:13 2012
@@ -18,13 +18,23 @@
-->
<ivy-module version="2.0">
<info organisation="org.apache.lucene" module="core-test-framework"/>
- <dependencies>
- <dependency org="org.apache.ant" name="ant" rev="1.8.2" transitive="false"/>
- <dependency org="org.apache.ant" name="ant-junit" rev="1.8.2" transitive="false"/>
- <dependency org="junit" name="junit" rev="4.10" transitive="false"/>
- <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="1.5.0" transitive="false" />
- <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="1.5.0" transitive="false"/>
+ <configurations>
+ <conf name="default" />
+ <!--
+ JUnit4 ANT task only, no ANT.
+ This is used from build scripts for taskdefs.
+ -->
+ <conf name="junit4-stdalone" />
+ </configurations>
+
+ <dependencies defaultconf="default">
+ <dependency org="org.apache.ant" name="ant" rev="1.8.2" transitive="false" />
+ <dependency org="org.apache.ant" name="ant-junit" rev="1.8.2" transitive="false" />
+
+ <dependency org="junit" name="junit" rev="4.10" transitive="false" conf="default->*;junit4-stdalone->*" />
+ <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="1.5.0" transitive="false" conf="default->*;junit4-stdalone->*" />
+ <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="1.5.0" transitive="false" conf="default->*;junit4-stdalone->*" />
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>