[FIXED JENKINS-16250] Use outputPath configuration option if available.

jenkinsci · Feb 13, 2013 · f314904 · f314904
1 parent 567fec4
commit f314904
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 2 deletions.
diff --git a/plugin/clean.sh b/plugin/clean.sh
diff --git a/plugin/debug.sh b/plugin/debug.sh
diff --git a/plugin/german.sh b/plugin/german.sh
diff --git a/plugin/go.sh b/plugin/go.sh
diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jvnet.hudson.plugins</groupId>
     <artifactId>analysis-pom</artifactId>
-    <version>1.40</version>
+    <version>1.42</version>
     <relativePath>../../analysis-pom/pom.xml</relativePath>
   </parent>
 

diff --git a/plugin/src/main/java/hudson/plugins/findbugs/FindBugsReporter.java b/plugin/src/main/java/hudson/plugins/findbugs/FindBugsReporter.java
@@ -1,5 +1,6 @@
 package hudson.plugins.findbugs;
 
+import hudson.FilePath;
 import hudson.maven.MavenAggregatedReport;
 import hudson.maven.MavenBuildProxy;
 import hudson.maven.MojoInfo;
@@ -11,6 +12,7 @@
 import hudson.plugins.analysis.core.ParserResult;
 import hudson.plugins.analysis.util.PluginLogger;
 import hudson.plugins.findbugs.parser.FindBugsParser;
+import hudson.remoting.VirtualChannel;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -170,7 +172,16 @@ public ParserResult perform(final MavenBuildProxy build, final MavenProject pom,
         FilesParser findBugsCollector = new FilesParser(PLUGIN_NAME, determineFileName(mojo),
                 new FindBugsParser(sources, isRankActivated), getModuleName(pom));
 
-        return getTargetPath(pom).act(findBugsCollector);
+        return getOutputPath(mojo, pom).act(findBugsCollector);
+    }
+
+    private FilePath getOutputPath(final MojoInfo mojo, final MavenProject pom) {
+        try {
+            return new FilePath((VirtualChannel)null, mojo.getConfigurationValue("findbugsXmlOutputDirectory", String.class));
+        }
+        catch (ComponentConfigurationException exception) {
+            return getTargetPath(pom);
+        }
     }
 
     @Override