Permalink
Browse files

[FIXED JENKINS-11669] Removed MatrixAggregator

Removed MatrixAggregator as not required after Jenkins 1.387 as
BuildTrigger is called from AbstractBuild.cleanup() in all cases
and we require 1.424 at the minimum.
  • Loading branch information...
cjo9900 committed Jan 28, 2013
1 parent 70aa20b commit 0ca4cbd2b9456b853be57bf8410bb24ee387effc
Showing with 1 addition and 13 deletions.
  1. +1 −13 src/main/java/hudson/plugins/parameterizedtrigger/BuildTrigger.java
@@ -4,9 +4,6 @@
import hudson.Extension;
import hudson.Launcher;
import hudson.Util;
import hudson.matrix.MatrixAggregatable;
import hudson.matrix.MatrixAggregator;
import hudson.matrix.MatrixBuild;
import hudson.model.AbstractBuild;
import hudson.model.AbstractProject;
import hudson.model.BuildListener;
@@ -23,7 +20,7 @@
import java.util.Arrays;
import java.util.List;

public class BuildTrigger extends Notifier implements DependecyDeclarer, MatrixAggregatable {
public class BuildTrigger extends Notifier implements DependecyDeclarer {

private final ArrayList<BuildTriggerConfig> configs;

@@ -87,15 +84,6 @@ private boolean canDeclare(AbstractProject owner) {
&& !ownerClassName.equals("hudson.plugins.promoted_builds.PromotionProcess");
}

public MatrixAggregator createAggregator(MatrixBuild build, Launcher launcher, BuildListener listener) {
return new MatrixAggregator(build, launcher, listener) {
@Override
public boolean endBuild() throws InterruptedException, IOException {
return hudson.tasks.BuildTrigger.execute(build, listener);
}
};
}

@Extension
public static class DescriptorImpl extends BuildStepDescriptor<Publisher> {
@Override

0 comments on commit 0ca4cbd

Please sign in to comment.