Make dep on matrix-project optional (#287)

jenkinsci · Jul 16, 2024 · f828e76 · f828e76
1 parent 807f0ff
commit f828e76
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -63,6 +63,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>matrix-project</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins.workflow</groupId>

diff --git a/src/main/java/htmlpublisher/HtmlPublisher.java b/src/main/java/htmlpublisher/HtmlPublisher.java
@@ -390,21 +390,26 @@ public Collection<? extends Action> getProjectActions(AbstractProject<?, ?> proj
             List<Action> actions = new ArrayList<>();
             for (HtmlPublisherTarget target : this.reportTargets) {
                 actions.add(target.getProjectAction(project));
-                if (project instanceof MatrixProject && ((MatrixProject) project).getActiveConfigurations() != null){
-                    for (MatrixConfiguration mc : ((MatrixProject) project).getActiveConfigurations()){
-                        try {
-                          mc.onLoad(mc.getParent(), mc.getName());
-                        }
-                        catch (IOException e){
-                            //Could not reload the configuration.
-                        }
-                    }
+                if (project.getClass().getName().equals("hudson.matrix.MatrixProject")) {
+                    adjustMatrixProject(project);
                 }
             }
             return actions;
         }
     }
 
+    private static void adjustMatrixProject(AbstractProject<?, ?> project) {
+        MatrixProject mp = (MatrixProject) project;
+        if (mp.getActiveConfigurations() != null) {
+            for (MatrixConfiguration mc : mp.getActiveConfigurations()) {
+                try {
+                    mc.onLoad(mc.getParent(), mc.getName());
+                } catch (IOException e) {
+                    //Could not reload the configuration.
+                }
+            }
+        }
+    }
 
     @SuppressRestrictedWarnings(NoExternalUse.class)
     public static DirScanner dirScannerGlob(String includes, String excludes, boolean useDefaultExcludes, OpenOption... openOptions) throws Exception {