[JENKINS-21268] Don't reference maven classes if plugin is deactivated.

jenkinsci · Jan 11, 2014 · 04d18b8 · 04d18b8
1 parent 17b8a47
commit 04d18b8
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
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.47</version>
+    <version>1.48</version>
     <relativePath>../../analysis-pom/pom.xml</relativePath>
   </parent>
 
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.jvnet.hudson.plugins</groupId>
       <artifactId>analysis-core</artifactId>
-      <version>1.54</version>
+      <version>1.55-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.jvnet.hudson.plugins</groupId>

diff --git a/plugin/src/main/java/hudson/plugins/findbugs/FindBugsPlugin.java b/plugin/src/main/java/hudson/plugins/findbugs/FindBugsPlugin.java
@@ -9,6 +9,7 @@
 
 import hudson.Plugin;
 
+import hudson.plugins.analysis.core.PluginDescriptor;
 import hudson.plugins.analysis.views.DetailFactory;
 
 /**
@@ -28,7 +29,9 @@ public void start() throws IOException, SAXException {
         FindBugsMessages.getInstance().initialize();
         FindBugsDetailFactory detailBuilder = new FindBugsDetailFactory();
         DetailFactory.addDetailBuilder(FindBugsResultAction.class, detailBuilder);
-        DetailFactory.addDetailBuilder(FindBugsMavenResultAction.class, detailBuilder);
+        if (PluginDescriptor.isMavenPluginInstalled()) {
+            MavenInitialization.run(detailBuilder);
+        }
 
         if (oldProperty != null) {
             System.setProperty(SAX_DRIVER_PROPERTY, oldProperty);

diff --git a/plugin/src/main/java/hudson/plugins/findbugs/MavenInitialization.java b/plugin/src/main/java/hudson/plugins/findbugs/MavenInitialization.java
@@ -0,0 +1,27 @@
+package hudson.plugins.findbugs;
+
+import hudson.plugins.analysis.views.DetailFactory;
+
+/**
+ * Initialization of Maven classes.
+ *
+ * @author Ulli Hafner
+ */
+public final class MavenInitialization {
+    /**
+     * Initializes the detail builder for Maven builds.
+     *
+     * @param detailBuilder
+     *            the builder to use
+     */
+    public static void run(final DetailFactory detailBuilder) {
+        DetailFactory.addDetailBuilder(FindBugsMavenResultAction.class, detailBuilder);
+    }
+
+    /**
+     * Creates a new instance of {@link MavenInitialization}.
+     */
+    private MavenInitialization() {
+        // prevents instantiation
+    }
+}