Skip to content
Permalink
Browse files

Merge pull request #102 from abayer/jenkins-26100

[JENKINS-26100] Change buildEnvVars to take Run
  • Loading branch information...
jglick committed May 19, 2017
2 parents 07ff1c7 + 67a6581 commit 5cc6e1c2b06b57cfa336a781b94bd9db76a0909c
Showing with 9 additions and 3 deletions.
  1. +2 −2 pom.xml
  2. +7 −1 src/main/java/hudson/plugins/mercurial/MercurialSCM.java
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>2.19</version>
<version>2.27</version>
<relativePath />
</parent>
<artifactId>mercurial</artifactId>
@@ -16,7 +16,7 @@
<properties>
<jenkins.version>1.642.3</jenkins.version>
<no-test-jar>false</no-test-jar>
<scm-api-plugin.version>2.0.8</scm-api-plugin.version>
<scm-api-plugin.version>2.1.0</scm-api-plugin.version>
</properties>

<developers>
@@ -880,8 +880,14 @@ private void clone(Run<?, ?> build, Launcher launcher, FilePath repository, Node
}
}

// TODO: 2.60+ Delete this override.
@Override
public void buildEnvVars(AbstractBuild<?,?> build, Map<String, String> env) {
public void buildEnvVars(AbstractBuild<?,?> build, Map<String,String> env) {
buildEnvironment(build, env);
}

// TODO: 2.60+ - add @Override.
public void buildEnvironment(Run<?,?> build, Map<String, String> env) {
buildEnvVarsFromActionable(build, env);
}

0 comments on commit 5cc6e1c

Please sign in to comment.
You can’t perform that action at this time.