bugfix: mark all extensions depending on optional plugins as optional (#933)

Author: bguerin

pipeline-maven/src/main/java/org/jenkinsci/plugins/pipeline/maven/publishers/ConcordionTestsPublisher.java

@@ -21,7 +21,6 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import htmlpublisher.HtmlPublisher;
 import htmlpublisher.HtmlPublisherTarget;
-import hudson.Extension;
 import hudson.FilePath;
 import hudson.model.Run;
 import hudson.model.StreamBuildListener;
@@ -41,6 +40,7 @@
 import org.jenkinsci.plugins.pipeline.maven.MavenPublisher;
 import org.jenkinsci.plugins.pipeline.maven.Messages;
 import org.jenkinsci.plugins.pipeline.maven.util.XmlUtils;
+import org.jenkinsci.plugins.variant.OptionalExtension;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.w3c.dom.Element;
@@ -168,7 +168,7 @@ private Collection<String> findConcordionOutputDirPatterns(@NonNull List<Element
     }
 
     @Symbol("concordionPublisher")
-    @Extension
+    @OptionalExtension(requirePlugins = "htmlpublisher")
     public static class DescriptorImpl extends MavenPublisher.DescriptorImpl {
         @NonNull
         @Override

pipeline-maven/src/main/java/org/jenkinsci/plugins/pipeline/maven/publishers/FindbugsAnalysisPublisher.java

@@ -25,7 +25,6 @@
 package org.jenkinsci.plugins.pipeline.maven.publishers;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import hudson.Extension;
 import hudson.FilePath;
 import hudson.Launcher;
 import hudson.model.Run;
@@ -42,6 +41,7 @@
 import org.jenkinsci.plugins.pipeline.maven.MavenSpyLogProcessor;
 import org.jenkinsci.plugins.pipeline.maven.Messages;
 import org.jenkinsci.plugins.pipeline.maven.util.XmlUtils;
+import org.jenkinsci.plugins.variant.OptionalExtension;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.w3c.dom.Element;
@@ -249,7 +249,7 @@ public void process(@NonNull StepContext context, @NonNull Element mavenSpyLogsE
      * Don't use symbol "findbugs", it would collide with hudson.plugins.findbugs.FindBugsPublisher
      */
     @Symbol("findbugsPublisher")
-    @Extension
+    @OptionalExtension(requirePlugins = "findbugs")
     public static class DescriptorImpl extends AbstractHealthAwarePublisher.DescriptorImpl {
         @NonNull
         @Override

pipeline-maven/src/main/java/org/jenkinsci/plugins/pipeline/maven/publishers/InvokerRunsPublisher.java

@@ -26,7 +26,6 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
-import hudson.Extension;
 import hudson.FilePath;
 import hudson.Launcher;
 import hudson.model.Run;
@@ -46,6 +45,7 @@
 import org.jenkinsci.plugins.pipeline.maven.MavenSpyLogProcessor;
 import org.jenkinsci.plugins.pipeline.maven.Messages;
 import org.jenkinsci.plugins.pipeline.maven.util.XmlUtils;
+import org.jenkinsci.plugins.variant.OptionalExtension;
 import org.jenkinsci.plugins.workflow.graph.FlowNode;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -299,7 +299,7 @@ protected String expandAndRelativize(
      * Don't use the symbol "junit", it would collide with hudson.tasks.junit.JUnitResultArchiver
      */
     @Symbol("invokerPublisher")
-    @Extension
+    @OptionalExtension(requirePlugins = "maven-invoker-plugin")
     public static class DescriptorImpl extends MavenPublisher.DescriptorImpl {
         @NonNull
         @Override

pipeline-maven/src/main/java/org/jenkinsci/plugins/pipeline/maven/publishers/JGivenTestsPublisher.java

@@ -21,7 +21,6 @@
 import static org.jenkinsci.plugins.pipeline.maven.publishers.DependenciesLister.listDependencies;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import hudson.Extension;
 import hudson.FilePath;
 import hudson.Launcher;
 import hudson.model.Run;
@@ -38,6 +37,7 @@
 import org.jenkinsci.plugins.pipeline.maven.MavenDependency;
 import org.jenkinsci.plugins.pipeline.maven.MavenPublisher;
 import org.jenkinsci.plugins.pipeline.maven.Messages;
+import org.jenkinsci.plugins.variant.OptionalExtension;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.w3c.dom.Element;
@@ -120,7 +120,7 @@ public void process(@NonNull final StepContext context, @NonNull final Element m
     }
 
     @Symbol("jgivenPublisher")
-    @Extension
+    @OptionalExtension(requirePlugins = "jgiven")
     public static class DescriptorImpl extends MavenPublisher.DescriptorImpl {
         @NonNull
         @Override

pipeline-maven/src/main/java/org/jenkinsci/plugins/pipeline/maven/publishers/JacocoReportPublisher.java

@@ -122,6 +122,7 @@ public void process(@NonNull StepContext context, @NonNull Element mavenSpyLogsE
 
     @Symbol("jacocoPublisher")
     @Extension
+    // @OptionalExtension(requirePlugins = "jacoco")
     public static class DescriptorImpl extends AbstractHealthAwarePublisher.DescriptorImpl {
         @NonNull
         @Override

pipeline-maven/src/main/java/org/jenkinsci/plugins/pipeline/maven/publishers/JunitTestsPublisher.java

@@ -27,7 +27,6 @@
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
-import hudson.Extension;
 import hudson.FilePath;
 import hudson.model.StreamBuildListener;
 import hudson.model.TaskListener;
@@ -48,6 +47,7 @@
 import org.jenkinsci.plugins.pipeline.maven.MavenSpyLogProcessor;
 import org.jenkinsci.plugins.pipeline.maven.Messages;
 import org.jenkinsci.plugins.pipeline.maven.util.XmlUtils;
+import org.jenkinsci.plugins.variant.OptionalExtension;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
@@ -399,7 +399,7 @@ public String toString() {
      * Don't use the symbol "junit", it would collide with hudson.tasks.junit.JUnitResultArchiver
      */
     @Symbol("junitPublisher")
-    @Extension
+    @OptionalExtension(requirePlugins = "junit")
     public static class DescriptorImpl extends MavenPublisher.DescriptorImpl {
         @NonNull
         @Override

pipeline-maven/src/main/java/org/jenkinsci/plugins/pipeline/maven/publishers/SpotBugsAnalysisPublisher.java

@@ -25,7 +25,6 @@
 package org.jenkinsci.plugins.pipeline.maven.publishers;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import hudson.Extension;
 import hudson.FilePath;
 import hudson.Launcher;
 import hudson.model.Run;
@@ -40,6 +39,7 @@
 import org.jenkinsci.plugins.pipeline.maven.MavenSpyLogProcessor;
 import org.jenkinsci.plugins.pipeline.maven.Messages;
 import org.jenkinsci.plugins.pipeline.maven.util.XmlUtils;
+import org.jenkinsci.plugins.variant.OptionalExtension;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.w3c.dom.Element;
@@ -247,7 +247,7 @@ public void process(@NonNull StepContext context, @NonNull Element mavenSpyLogsE
     }
 
     @Symbol("spotbugsPublisher")
-    @Extension
+    @OptionalExtension(requirePlugins = "findbugs")
     public static class DescriptorImpl extends AbstractHealthAwarePublisher.DescriptorImpl {
         @NonNull
         @Override

pipeline-maven/src/main/java/org/jenkinsci/plugins/pipeline/maven/publishers/TasksScannerPublisher.java

@@ -1,7 +1,6 @@
 package org.jenkinsci.plugins.pipeline.maven.publishers;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import hudson.Extension;
 import hudson.FilePath;
 import hudson.Launcher;
 import hudson.model.Run;
@@ -20,6 +19,7 @@
 import org.jenkinsci.plugins.pipeline.maven.MavenArtifact;
 import org.jenkinsci.plugins.pipeline.maven.Messages;
 import org.jenkinsci.plugins.pipeline.maven.util.XmlUtils;
+import org.jenkinsci.plugins.variant.OptionalExtension;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
@@ -259,7 +259,7 @@ public void setAsRegexp(boolean asRegexp) {
     }
 
     @Symbol("openTasksPublisher")
-    @Extension
+    @OptionalExtension(requirePlugins = "tasks")
     public static class DescriptorImpl extends AbstractHealthAwarePublisher.DescriptorImpl {
         @NonNull
         @Override

pipeline-maven/src/test/java/org/jenkinsci/plugins/pipeline/maven/WithMavenStepNoOptionalsTest.java

@@ -36,9 +36,8 @@ public class WithMavenStepNoOptionalsTest {
     @Rule
     public RealJenkinsRule jenkinsRule = new RealJenkinsRule()
             .omitPlugins(
-                    "mysql-api",
-                    "postgresql-api",
-                    "maven-plugin",
+                    "coverage",
+                    "findbugs",
                     "flaky-test-handler",
                     "htmlpublisher",
                     "jacoco",
@@ -47,8 +46,10 @@ public class WithMavenStepNoOptionalsTest {
                     "junit-attachments",
                     "matrix-project",
                     "maven-invoker-plugin",
+                    "maven-plugin",
+                    "mysql-api",
                     "pipeline-build-step",
-                    "findbugs",
+                    "postgresql-api",
                     "tasks");
 
     @Test