summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakozak2011-11-24 09:19:07 (EST)
committer Winston Prakash2011-12-01 20:47:28 (EST)
commit316d27516003425e67f00e2f57901b9b7cd817e6 (patch)
tree519a8cf24eda4ad8317c12e826f8993c1e3112ea
parent336cfd3073d8ba1e460da6dbce8f3cd96a79fa07 (diff)
downloadorg.eclipse.hudson.core-316d27516003425e67f00e2f57901b9b7cd817e6.zip
org.eclipse.hudson.core-316d27516003425e67f00e2f57901b9b7cd817e6.tar.gz
org.eclipse.hudson.core-316d27516003425e67f00e2f57901b9b7cd817e6.tar.bz2
Changed generic of BaseBuildableProject to save backward compatibility with publishers (@see BuildStepCompatibilityLayer#perform(Build<?,?> build, Launcher launcher, BuildListener listener))
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
-rw-r--r--hudson-core/src/main/java/hudson/matrix/MatrixBuild.java3
-rw-r--r--hudson-core/src/main/java/hudson/model/BaseBuildableProject.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/hudson-core/src/main/java/hudson/matrix/MatrixBuild.java b/hudson-core/src/main/java/hudson/matrix/MatrixBuild.java
index 9422d70..31f0718 100644
--- a/hudson-core/src/main/java/hudson/matrix/MatrixBuild.java
+++ b/hudson-core/src/main/java/hudson/matrix/MatrixBuild.java
@@ -17,6 +17,7 @@
package hudson.matrix;
import hudson.Util;
+import hudson.model.AbstractBuild;
import hudson.model.AbstractProject;
import hudson.model.Build;
import hudson.model.BuildListener;
@@ -50,7 +51,7 @@ import org.kohsuke.stapler.StaplerResponse;
*
* @author Kohsuke Kawaguchi
*/
-public class MatrixBuild extends Build<MatrixProject, MatrixBuild> {
+public class MatrixBuild extends AbstractBuild<MatrixProject, MatrixBuild> {
private AxisList axes;
public MatrixBuild(MatrixProject job) throws IOException {
diff --git a/hudson-core/src/main/java/hudson/model/BaseBuildableProject.java b/hudson-core/src/main/java/hudson/model/BaseBuildableProject.java
index 3be1bd0..a7e2100 100644
--- a/hudson-core/src/main/java/hudson/model/BaseBuildableProject.java
+++ b/hudson-core/src/main/java/hudson/model/BaseBuildableProject.java
@@ -45,7 +45,7 @@ import org.kohsuke.stapler.StaplerResponse;
*
* @author Anton Kozak.
*/
-public abstract class BaseBuildableProject<P extends BaseBuildableProject<P,B>,B extends Build<P,B>>
+public abstract class BaseBuildableProject<P extends BaseBuildableProject<P,B>,B extends AbstractBuild<P,B>>
extends AbstractProject<P, B>
implements Saveable, BuildableItemWithBuildWrappers, IProject {