diff --git a/pom.xml b/pom.xml
index 80475f6611..1a85fede2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -220,7 +220,7 @@
org.jenkins-ci.plugins
parameterized-trigger
- 2.9
+ 2.33
true
diff --git a/src/main/java/hudson/plugins/git/GitSCM.java b/src/main/java/hudson/plugins/git/GitSCM.java
index 7284d2fdd2..b9eeb5e544 100644
--- a/src/main/java/hudson/plugins/git/GitSCM.java
+++ b/src/main/java/hudson/plugins/git/GitSCM.java
@@ -1257,8 +1257,14 @@ private void computeChangeLog(GitClient git, Revision revToBuild, TaskListener l
}
}
- public void buildEnvVars(AbstractBuild, ?> build, java.util.Map env) {
- super.buildEnvVars(build, env);
+ // TODO: 2.60+ Delete this override.
+ @Override
+ public void buildEnvVars(AbstractBuild, ?> build, Map env) {
+ buildEnvironment(build, env);
+ }
+
+ // TODO: 2.60+ Switch to @Override
+ public void buildEnvironment(Run, ?> build, java.util.Map env) {
Revision rev = fixNull(getBuildData(build)).getLastBuiltRevision();
if (rev!=null) {
Branch branch = Iterables.getFirst(rev.getBranches(), null);
@@ -1321,7 +1327,7 @@ private String getBranchName(Branch branch)
return name;
}
- private String getLastBuiltCommitOfBranch(AbstractBuild, ?> build, Branch branch) {
+ private String getLastBuiltCommitOfBranch(Run, ?> build, Branch branch) {
String prevCommit = null;
if (build.getPreviousBuiltBuild() != null) {
final Build lastBuildOfBranch = fixNull(getBuildData(build.getPreviousBuiltBuild())).getLastBuildOfBranch(branch.getName());
@@ -1335,7 +1341,7 @@ private String getLastBuiltCommitOfBranch(AbstractBuild, ?> build, Branch bran
return prevCommit;
}
- private String getLastSuccessfulBuiltCommitOfBranch(AbstractBuild, ?> build, Branch branch) {
+ private String getLastSuccessfulBuiltCommitOfBranch(Run, ?> build, Branch branch) {
String prevCommit = null;
if (build.getPreviousSuccessfulBuild() != null) {
final Build lastSuccessfulBuildOfBranch = fixNull(getBuildData(build.getPreviousSuccessfulBuild())).getLastBuildOfBranch(branch.getName());