Make maven plugin option (#98)

jenkinsci · May 9, 2018 · e75992b · e75992b
1 parent c612ade
commit e75992b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ temp
 work
 *.iml
 .idea/
+.DS_Store
diff --git a/pom.xml b/pom.xml
@@ -95,6 +95,18 @@
       <version>4.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.main</groupId>
+      <artifactId>maven-plugin</artifactId>
+      <version>3.1.2</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>mailer</artifactId>
+      <version>1.13</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
       <artifactId>workflow-job</artifactId>

diff --git a/src/main/java/hudson/plugins/cobertura/MavenCoberturaPublisher.java b/src/main/java/hudson/plugins/cobertura/MavenCoberturaPublisher.java
@@ -237,7 +237,7 @@ public MavenReporterDescriptor getDescriptor() {
     /**
      * Descriptor should be singleton.
      */
-    @Extension
+    @Extension(optional = true)
     public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl();
 
     public static final class DescriptorImpl extends MavenReporterDescriptor {

diff --git a/src/test/java/hudson/plugins/cobertura/CoberturaCoverageParserTest.java b/src/test/java/hudson/plugins/cobertura/CoberturaCoverageParserTest.java
@@ -10,8 +10,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.HashSet;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
 import org.jvnet.hudson.test.Bug;
 import org.netbeans.insane.scanner.CountingVisitor;
 import org.netbeans.insane.scanner.ScannerUtils;
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,3 +7,4 @@ temp @@
     work
     *.iml
     .idea/
+    .DS_Store