[JENKINS-31202] Make remaining plugins compatible to SimpleBuildStep.

checkstyle, dry, findbugs, pmd, tasks, analysis-collector.
jenkinsci · Nov 13, 2016 · 2467ad3 · 2467ad3
1 parent 8bbd4c8
commit 2467ad3
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 80 deletions.
diff --git a/go.sh b/go.sh
@@ -1,4 +1,4 @@
-rm -rf $JENKINS_HOME/plugins/warnings*
+rm -rf $JENKINS_HOME/plugins/tasks*
 
 mvn install || { echo "Build failed"; exit 1; }
 

diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.jvnet.hudson.plugins</groupId>
       <artifactId>analysis-core</artifactId>
-      <version>1.77</version>
+      <version>1.80-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.jvnet.hudson.plugins</groupId>

diff --git a/src/main/java/hudson/plugins/tasks/TasksProjectAction.java b/src/main/java/hudson/plugins/tasks/TasksProjectAction.java
@@ -1,8 +1,8 @@
 package hudson.plugins.tasks;
 
-import hudson.model.AbstractProject;
-import hudson.plugins.analysis.core.ResultAction;
+import hudson.model.Job;
 import hudson.plugins.analysis.core.AbstractProjectAction;
+import hudson.plugins.analysis.core.ResultAction;
 
 /**
  * Entry point to visualize the task scanner trend graph. Drawing of the graph is
@@ -14,24 +14,24 @@ public class TasksProjectAction extends AbstractProjectAction<ResultAction<Tasks
     /**
      * Instantiates a new {@link TasksProjectAction}.
      *
-     * @param project
-     *            the project that owns this action
+     * @param job
+     *            the job that owns this action
      */
-    public TasksProjectAction(final AbstractProject<?, ?> project) {
-        this(project, TasksResultAction.class);
+    public TasksProjectAction(final Job<?, ?> job) {
+        this(job, TasksResultAction.class);
     }
 
     /**
      * Instantiates a new {@link TasksProjectAction}.
      *
-     * @param project
-     *            the project that owns this action
+     * @param job
+     *            the job that owns this action
      * @param type
      *            the result action type
      */
-    public TasksProjectAction(final AbstractProject<?, ?> project,
+    public TasksProjectAction(final Job<?, ?> job,
             final Class<? extends ResultAction<TasksResult>> type) {
-        super(project, type, Messages._Tasks_ProjectAction_Name(), Messages._Tasks_Trend_Name(),
+        super(job, type, Messages._Tasks_ProjectAction_Name(), Messages._Tasks_Trend_Name(),
                 TasksDescriptor.PLUGIN_ID, TasksDescriptor.ICON_URL, TasksDescriptor.RESULT_URL);
     }
 }

diff --git a/src/main/java/hudson/plugins/tasks/TasksPublisher.java b/src/main/java/hudson/plugins/tasks/TasksPublisher.java
@@ -10,12 +10,8 @@
 import hudson.Launcher;
 import hudson.matrix.MatrixAggregator;
 import hudson.matrix.MatrixBuild;
-
-import hudson.model.AbstractProject;
-import hudson.model.Run;
-import hudson.model.Action;
 import hudson.model.BuildListener;
-
+import hudson.model.Run;
 import hudson.plugins.analysis.core.BuildResult;
 import hudson.plugins.analysis.core.HealthAwarePublisher;
 import hudson.plugins.analysis.util.PluginLogger;
@@ -178,11 +174,6 @@ public void setAsRegexp(boolean asRegexp) {
         this.asRegexp = asRegexp;
     }
 
-    @Override
-    public Action getProjectAction(final AbstractProject<?, ?> project) {
-        return new TasksProjectAction(project);
-    }
-
     @Override
     protected BuildResult perform(final Run<?, ?> build, FilePath workspace, final PluginLogger logger) throws InterruptedException, IOException {
         TasksParserResult project;

diff --git a/src/main/java/hudson/plugins/tasks/TasksResultAction.java b/src/main/java/hudson/plugins/tasks/TasksResultAction.java
@@ -1,5 +1,8 @@
 package hudson.plugins.tasks;
 
+import java.util.Collection;
+
+import hudson.model.Action;
 import hudson.model.Run;
 
 import hudson.plugins.analysis.core.HealthDescriptor;
@@ -53,4 +56,8 @@ public String getSingleItemTooltip() {
         return Messages.Tasks_ResultAction_OneWarning();
     }
 
+    @Override
+    public Collection<? extends Action> getProjectActions() {
+        return asSet(new TasksProjectAction(getJob()));
+    }
 }