[nutch] branch master updated: NUTCH-2894 Java plugin compilation classpath: priorize plugin dependencies

[snagel]

This is an automated email from the ASF dual-hosted git repository.

snagel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nutch.git


The following commit(s) were added to refs/heads/master by this push:
     new e749e3f  NUTCH-2894 Java plugin compilation classpath: priorize plugin 
dependencies
     new eeb9863  Merge pull request #696 from 
sebastian-nagel/NUTCH-2894-plugin-compile-classpath
e749e3f is described below

commit e749e3f4cc76120b98198f0003fb28ad9ce739e1
Author: Sebastian Nagel <sna...@apache.org>
AuthorDate: Sun Sep 19 22:10:31 2021 +0200

    NUTCH-2894 Java plugin compilation classpath: priorize plugin dependencies
---
 src/plugin/build-plugin.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/plugin/build-plugin.xml b/src/plugin/build-plugin.xml
index 8809f06..814123e 100755
--- a/src/plugin/build-plugin.xml
+++ b/src/plugin/build-plugin.xml
@@ -55,13 +55,16 @@
     <pathelement location="${build.classes}"/>
     <fileset refid="lib.jars"/>
     <pathelement location="${nutch.root}/build/classes"/>
-    <fileset dir="${nutch.root}/build/lib">
-      <include name="*.jar" />
-    </fileset>
+    <!-- manually managed dependencies of a plugin -->
     <path refid="plugin.deps"/>
+    <!-- plugin dependencies managed by ivy -->
     <fileset dir="${deploy.dir}">
       <include name="*.jar" />
     </fileset>
+    <!-- Nutch core dependencies -->
+    <fileset dir="${nutch.root}/build/lib">
+      <include name="*.jar" />
+    </fileset>
   </path>
 
   <!-- the unit test classpath -->
@@ -71,7 +74,7 @@
     <pathelement location="${nutch.root}/src/test"/>
     <pathelement location="${conf.dir}"/>
     <pathelement location="${nutch.root}/build"/>
-    <!-- test dependencies specific to current plugin -->
+    <!-- test dependencies specific to the current plugin -->
     <fileset dir="${build.test.lib}">
       <include name="*.jar" />
     </fileset>