[JENKINS-26100] Change buildEnvVars to take Run

jenkinsci · May 1, 2017 · 3592fa4 · 3592fa4
1 parent 07ff1c7
commit 3592fa4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>2.19</version>
+        <version>2.27-20170501.155323-2</version> <!-- TODO: Switch to 2.27 once https://github.com/jenkinsci/plugin-pom/pull/59 is released -->
         <relativePath />
     </parent>
     <artifactId>mercurial</artifactId>
@@ -14,9 +14,10 @@
     <url>http://wiki.jenkins-ci.org/display/JENKINS/Mercurial+Plugin</url>
 
     <properties>
-      <jenkins.version>1.642.3</jenkins.version>
+        <jenkins-core.version>2.58-20170501.171905-3</jenkins-core.version> <!-- TODO: Switch to release once https://github.com/jenkinsci/jenkins/pull/2730 is merged and released -->
+        <jenkins-war.version>2.58-20170501.171927-3</jenkins-war.version> <!-- TODO: Switch to release once https://github.com/jenkinsci/jenkins/pull/2730 is merged and released -->
       <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>

diff --git a/src/main/java/hudson/plugins/mercurial/MercurialSCM.java b/src/main/java/hudson/plugins/mercurial/MercurialSCM.java
@@ -881,7 +881,7 @@ private void clone(Run<?, ?> build, Launcher launcher, FilePath repository, Node
     }
 
     @Override
-    public void buildEnvVars(AbstractBuild<?,?> build, Map<String, String> env) {
+    public void buildEnvVars(Run<?,?> build, Map<String, String> env) {
         buildEnvVarsFromActionable(build, env);
     }