This is an automated email from the ASF dual-hosted git repository. lewismc 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 cc0da7e NUTCH-2819 Move spotbugs "installation" directory to avoid that spotbugs is shipped in Nutch runtime (#565) cc0da7e is described below commit cc0da7e860723f7b8e89429a8f1f11551ecf118f Author: Sebastian Nagel <sna...@apache.org> AuthorDate: Mon Feb 1 01:05:27 2021 +0100 NUTCH-2819 Move spotbugs "installation" directory to avoid that spotbugs is shipped in Nutch runtime (#565) - install spotbugs into to ivy/spotbugs-x.x.x/ - upgrade to Spotbugs 4.2.0 - move task definition into spotbugs target, otherwise running download/installation and bug spotting together fails --- .gitignore | 1 + build.xml | 19 +++++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 249ca77..6d96644 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ ivy/ivy-2.3.0.jar ivy/ivy-2.4.0.jar ivy/ivy-2.5.0-rc1.jar ivy/ivy-2.5.0.jar +ivy/spotbugs-*/ naivebayes-model .naivebayes-model.crc .gitconfig diff --git a/build.xml b/build.xml index 68a0f44..882a54a 100644 --- a/build.xml +++ b/build.xml @@ -41,8 +41,8 @@ <property name="dependency-check.home" value="${ivy.dir}/dependency-check-ant/"/> - <property name="spotbugs.version" value="4.1.1" /> - <property name="spotbugs.home" value="${basedir}/lib/spotbugs-${spotbugs.version}" /> + <property name="spotbugs.version" value="4.2.0" /> + <property name="spotbugs.home" value="${ivy.dir}/spotbugs-${spotbugs.version}" /> <property name="spotbugs.jar" value="${spotbugs.home}/lib/spotbugs-ant.jar" /> <property name="apache-rat.version" value="0.13" /> @@ -1066,20 +1066,19 @@ <target name="spotbugs-download-unchecked" unless="spotbugs.jar.found" description="--> downloads the spotbugs binary (spotbugs-*.tgz)."> <get src="https://github.com/spotbugs/spotbugs/releases/download/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz " - dest="${basedir}/lib/spotbugs-${spotbugs.version}.tgz" usetimestamp="false" /> + dest="${ivy.dir}/spotbugs-${spotbugs.version}.tgz" usetimestamp="false" /> - <untar src="${basedir}/lib/spotbugs-${spotbugs.version}.tgz" - dest="${basedir}/lib/" compression="gzip"> + <untar src="${ivy.dir}/spotbugs-${spotbugs.version}.tgz" + dest="${ivy.dir}" compression="gzip"> </untar> - <delete file="${basedir}/lib/spotbugs-${spotbugs.version}.tgz" /> + <delete file="${ivy.dir}/spotbugs-${spotbugs.version}.tgz" /> </target> - <taskdef - resource="edu/umd/cs/findbugs/anttask/tasks.properties" - classpath="${spotbugs.jar}" /> - <target name="spotbugs" depends="jar, compile-plugins, spotbugs-download" description="--> runs spotbugs source code analysis."> + <taskdef + resource="edu/umd/cs/findbugs/anttask/tasks.properties" + classpath="${spotbugs.jar}" /> <spotbugs home="${spotbugs.home}" output="html" outputFile="${build.dir}/nutch-spotbugs.html"