diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 961db7184f3ce0890881ce1050c92f316c08bc52..5ddadd6adeb27104402d5f4e18861d17340645a3 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -1940,7 +1940,7 @@ public abstract class AbstractProject
,R extends A
}
AbstractBuild,?> getBuild() {
- return (AbstractBuild) e.getParent().getBuild();
+ return e.getParent().build;
}
}
diff --git a/core/src/main/java/hudson/scm/AbstractScmTagAction.java b/core/src/main/java/hudson/scm/AbstractScmTagAction.java
index c0c74b47a456eaeb981c892fa2c302b2283780ac..076824b4368236c66fdc83a5b244be9dccbdc251 100644
--- a/core/src/main/java/hudson/scm/AbstractScmTagAction.java
+++ b/core/src/main/java/hudson/scm/AbstractScmTagAction.java
@@ -23,7 +23,6 @@
*/
package hudson.scm;
-import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
import hudson.model.AbstractBuild;
import hudson.model.TaskAction;
import hudson.model.BuildBadgeAction;
@@ -36,7 +35,6 @@ import org.kohsuke.stapler.StaplerResponse;
import javax.servlet.ServletException;
import java.io.IOException;
import jenkins.model.RunAction2;
-import org.jenkinsci.bytecode.AdaptField;
/**
* Common part of CVSSCM.TagAction and SubversionTagAction.
@@ -50,10 +48,13 @@ import org.jenkinsci.bytecode.AdaptField;
*/
public abstract class AbstractScmTagAction extends TaskAction implements BuildBadgeAction, RunAction2 {
- private transient /*final*/ Run,?> build;
+ private transient /*final*/ Run,?> run;
+ @Deprecated
+ protected transient /*final*/ AbstractBuild build;
- protected AbstractScmTagAction(Run,?> build) {
- this.build = build;
+ protected AbstractScmTagAction(Run,?> run) {
+ this.run = run;
+ this.build = run instanceof AbstractBuild ? (AbstractBuild) run : null;
}
@Deprecated
@@ -73,9 +74,12 @@ public abstract class AbstractScmTagAction extends TaskAction implements BuildBa
return SCM.TAG;
}
- @AdaptField(name="build", was=AbstractBuild.class)
- @WithBridgeMethods(value=AbstractBuild.class, castRequired=true)
- public Run getBuild() {
+ public Run,?> getRun() {
+ return run;
+ }
+
+ @Deprecated
+ public AbstractBuild getBuild() {
return build;
}
@@ -92,7 +96,7 @@ public abstract class AbstractScmTagAction extends TaskAction implements BuildBa
public abstract boolean isTagged();
protected ACL getACL() {
- return build.getACL();
+ return run.getACL();
}
public void doIndex(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
@@ -110,7 +114,8 @@ public abstract class AbstractScmTagAction extends TaskAction implements BuildBa
}
@Override public void onLoad(Run, ?> r) {
- build = r;
+ run = r;
+ build = run instanceof AbstractBuild ? (AbstractBuild) run : null;
}
}
diff --git a/core/src/main/java/hudson/scm/ChangeLogSet.java b/core/src/main/java/hudson/scm/ChangeLogSet.java
index 0b1d6827e0a277aa4042de6bf464bbcc899e578f..96fa1395b46b0be5a9b710a86e1632a8210a3d61 100644
--- a/core/src/main/java/hudson/scm/ChangeLogSet.java
+++ b/core/src/main/java/hudson/scm/ChangeLogSet.java
@@ -58,11 +58,14 @@ public abstract class ChangeLogSet${%Polling Log}