svn commit: r1610624 - in /nutch/trunk: CHANGES.txt build.xml ivy/ivy.xml src/plugin/build-plugin.xml src/plugin/build.xml

[jn...@apache.org]

Author: jnioche
Date: Tue Jul 15 08:39:16 2014
New Revision: 1610624

URL: http://svn.apache.org/r1610624
Log:
NUTCH-1804 Move JUnit dependency to test scope

Modified:
    nutch/trunk/CHANGES.txt
    nutch/trunk/build.xml
    nutch/trunk/ivy/ivy.xml
    nutch/trunk/src/plugin/build-plugin.xml
    nutch/trunk/src/plugin/build.xml

Modified: nutch/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1610624&r1=1610623&r2=1610624&view=diff
==============================================================================
--- nutch/trunk/CHANGES.txt (original)
+++ nutch/trunk/CHANGES.txt Tue Jul 15 08:39:16 2014
@@ -2,6 +2,8 @@ Nutch Change Log
 
 Nutch Current Development
 
+* NUTCH-1804 Move JUnit dependency to test scope (jnioche)
+
 * NUTCH-1811 bin/nutch junit to use junit 4 test runner (snagel)
 
 * NUTCH-1799 ANT Eclipse task discovers all plugin jars automatically (jnioche)

Modified: nutch/trunk/build.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/build.xml?rev=1610624&r1=1610623&r2=1610624&view=diff
==============================================================================
--- nutch/trunk/build.xml (original)
+++ nutch/trunk/build.xml Tue Jul 15 08:39:16 2014
@@ -455,7 +455,7 @@
 
   </target>   
 
-  <target name="test-plugins" depends="compile,resolve-test" description="--> run plugin JUnit tests only">
+  <target name="test-plugins" depends="resolve-test, compile" description="--> run plugin JUnit tests only">
     <ant dir="src/plugin" target="test" inheritAll="false"/>
   </target>
 

Modified: nutch/trunk/ivy/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/ivy/ivy.xml?rev=1610624&r1=1610623&r2=1610624&view=diff
==============================================================================
--- nutch/trunk/ivy/ivy.xml (original)
+++ nutch/trunk/ivy/ivy.xml Tue Jul 15 08:39:16 2014
@@ -74,7 +74,7 @@
 		<!--Configuration: test -->
 
 		<!--artifacts needed for testing -->
-		<dependency org="junit" name="junit" rev="4.11" conf="*->default" />
+		<dependency org="junit" name="junit" rev="4.11" conf="test->default" />
 
 		<dependency org="org.apache.hadoop" name="hadoop-test" rev="1.2.0"
 			conf="test->default" />

Modified: nutch/trunk/src/plugin/build-plugin.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/build-plugin.xml?rev=1610624&r1=1610623&r2=1610624&view=diff
==============================================================================
--- nutch/trunk/src/plugin/build-plugin.xml (original)
+++ nutch/trunk/src/plugin/build-plugin.xml Tue Jul 15 08:39:16 2014
@@ -37,6 +37,7 @@
   <property name="build.dir" location="${nutch.root}/build/${name}"/>
   <property name="build.classes" location="${build.dir}/classes"/>
   <property name="build.test" location="${build.dir}/test"/>
+  <property name="build.test.lib" location="${build.test}/lib"/>
 
   <property name="deploy.dir" location="${nutch.root}/build/plugins/${name}"/>
 
@@ -70,6 +71,14 @@
     <pathelement location="${nutch.root}/src/test"/>
     <pathelement location="${conf.dir}"/>
     <pathelement location="${nutch.root}/build"/>
+    <!-- test dependencies specific to current plugin -->
+    <fileset dir="${build.test.lib}">
+      <include name="*.jar" />
+    </fileset>
+    <!-- global test dependencies -->
+    <fileset dir="${nutch.root}/build/test/lib">
+      <include name="*.jar" />
+    </fileset>
     <path refid="classpath"/>
   </path>
 
@@ -80,6 +89,7 @@
     <mkdir dir="${build.dir}"/>
     <mkdir dir="${build.classes}"/>
     <mkdir dir="${build.test}"/>
+    <mkdir dir="${build.test.lib}"/>
     <mkdir dir="${deploy.dir}"/>
 
     <antcall target="init-plugin"/>
@@ -216,7 +226,7 @@
 
   <target name="resolve-test" depends="clean-lib" description="resolve and retrieve dependencies with ivy">
     <ivy:resolve file="ivy.xml" conf="test" log="download-only"/>
-    <ivy:retrieve pattern="${deploy.dir}/[artifact]-[revision].[ext]" symlink="false" log="quiet"/>
+    <ivy:retrieve pattern="${build.test.lib}/[artifact]-[revision].[ext]" symlink="false" log="quiet"/>
   </target>
 
   <!-- ================================================================== -->

Modified: nutch/trunk/src/plugin/build.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/build.xml?rev=1610624&r1=1610623&r2=1610624&view=diff
==============================================================================
--- nutch/trunk/src/plugin/build.xml (original)
+++ nutch/trunk/src/plugin/build.xml Tue Jul 15 08:39:16 2014
@@ -128,9 +128,9 @@
     <ant dir="indexer-elastic" target="clean"/>
     <ant dir="indexer-solr" target="clean"/>
     <ant dir="language-identifier" target="clean"/>
-    <ant dir="lib-commons-httpclient" target="clean"/>
+    <!-- <ant dir="lib-commons-httpclient" target="clean"/> -->
     <ant dir="lib-http" target="clean"/>
-    <ant dir="lib-lucene-analyzers" target="clean"/>
+    <!-- <ant dir="lib-lucene-analyzers" target="clean"/>-->
     <ant dir="lib-nekohtml" target="clean"/>
     <ant dir="lib-regex-filter" target="clean"/>
     <ant dir="lib-xml" target="clean"/>