Author: snagel
Date: Mon Jan 12 20:45:16 2015
New Revision: 1651193
URL: http://svn.apache.org/r1651193
Log:
NUTCH-1881 ant target resolve-default to keep test libs
Modified:
nutch/trunk/CHANGES.txt
nutch/trunk/build.xml
Modified: nutch/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1651193&r1=1651192&r2=1651193&view=diff
==============================================================================
--- nutch/trunk/CHANGES.txt (original)
+++ nutch/trunk/CHANGES.txt Mon Jan 12 20:45:16 2015
@@ -2,6 +2,8 @@ Nutch Change Log
Nutch Current Development 1.10-SNAPSHOT
+* NUTCH-1881 ant target resolve-default to keep test libs (snagel)
+
* NUTCH-1660 Index filter for Page's latitude and longitude (Yasin Kılınç,
lewismc)
* NUTCH-1140 index-more plugin, resetTitle creates multiple values in title
field (Joe Liedtke, kaveh minooie via snagel)
Modified: nutch/trunk/build.xml
URL:
http://svn.apache.org/viewvc/nutch/trunk/build.xml?rev=1651193&r1=1651192&r2=1651193&view=diff
==============================================================================
--- nutch/trunk/build.xml (original)
+++ nutch/trunk/build.xml Mon Jan 12 20:45:16 2015
@@ -468,13 +468,13 @@
<!-- ================================================================== -->
<!-- target: resolve ================================================= -->
- <target name="resolve-default" depends="clean-lib" description="--> resolve
and retrieve dependencies with ivy">
+ <target name="resolve-default" depends="clean-default-lib" description="-->
resolve and retrieve dependencies with ivy">
<ivy:resolve file="${ivy.file}" conf="default" log="download-only"/>
<ivy:retrieve pattern="${build.lib.dir}/[artifact]-[revision].[ext]"
symlink="false" log="quiet"/>
<antcall target="copy-libs"/>
</target>
- <target name="resolve-test" depends="clean-lib, init" description="-->
resolve and retrieve dependencies with ivy">
+ <target name="resolve-test" depends="clean-test-lib, init" description="-->
resolve and retrieve dependencies with ivy">
<ivy:resolve file="${ivy.file}" conf="test" log="download-only"/>
<ivy:retrieve pattern="${test.build.lib.dir}/[artifact]-[revision].[ext]"
symlink="false" log="quiet"/>
<antcall target="copy-libs"/>
@@ -822,8 +822,15 @@
</target>
<!-- target: clean-lib =============================================== -->
- <target name="clean-lib" description="--> clean the project libraries
directory (dependencies)">
- <delete includeemptydirs="true" dir="${build.lib.dir}"/>
+ <target name="clean-lib" depends="clean-default-lib, clean-test-lib"
+ description="--> clean the project libraries directories
(dependencies: default + test)">
+ </target>
+ <!-- target: clean-default-lib
=============================================== -->
+ <target name="clean-default-lib" description="--> clean the project
libraries directory (dependencies)">
+ <delete includeemptydirs="true" dir="${build.lib.dir}"/>
+ </target>
+ <!-- target: clean-test-lib ===============================================
-->
+ <target name="clean-test-lib" description="--> clean the project test
libraries directory (dependencies)">
<delete includeemptydirs="true" dir="${test.build.lib.dir}"/>
</target>
