From 3592fa40faec68409cda8a05818a4bb853d7da7d Mon Sep 17 00:00:00 2001
From: Andrew Bayer <andrew.bayer@gmail.com>
Date: Mon, 1 May 2017 16:30:01 -0400
Subject: [PATCH 1/5] [JENKINS-26100] Change buildEnvVars to take Run

---
 pom.xml                                                  | 7 ++++---
 src/main/java/hudson/plugins/mercurial/MercurialSCM.java | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index b92b7ab6..c195c8d0 100644
--- 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
index b37e4767..d968107c 100755
--- 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);
     }
 

From d205135d00740f73613be466c7af2e4d7384c4fa Mon Sep 17 00:00:00 2001
From: Andrew Bayer <andrew.bayer@gmail.com>
Date: Tue, 2 May 2017 16:14:21 -0400
Subject: [PATCH 2/5] Update to use buildEnvironment

---
 pom.xml                                                  | 6 +++---
 src/main/java/hudson/plugins/mercurial/MercurialSCM.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index c195c8d0..e82e5825 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>2.27-20170501.155323-2</version> <!-- TODO: Switch to 2.27 once https://github.com/jenkinsci/plugin-pom/pull/59 is released -->
+        <version>2.27</version>
         <relativePath />
     </parent>
     <artifactId>mercurial</artifactId>
@@ -14,8 +14,8 @@
     <url>http://wiki.jenkins-ci.org/display/JENKINS/Mercurial+Plugin</url>
     
     <properties>
-        <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 -->
+        <jenkins-core.version>2.58-20170502.192524-8</jenkins-core.version> <!-- TODO: Switch to release once https://github.com/jenkinsci/jenkins/pull/2730 is merged and released -->
+        <jenkins-war.version>2.58-20170502.192544-8</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.1.0</scm-api-plugin.version>
     </properties>
diff --git a/src/main/java/hudson/plugins/mercurial/MercurialSCM.java b/src/main/java/hudson/plugins/mercurial/MercurialSCM.java
index d968107c..35181308 100755
--- 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(Run<?,?> build, Map<String, String> env) {
+    public void buildEnvironment(Run<?,?> build, Map<String, String> env) {
         buildEnvVarsFromActionable(build, env);
     }
 

From 7ba9d551801df9cfe908af1faf48f6219eb3d3cc Mon Sep 17 00:00:00 2001
From: Andrew Bayer <andrew.bayer@gmail.com>
Date: Tue, 16 May 2017 19:11:14 -0400
Subject: [PATCH 3/5] Switch to Jenkins 2.60

---
 pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e82e5825..c3bf521b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,8 +14,7 @@
     <url>http://wiki.jenkins-ci.org/display/JENKINS/Mercurial+Plugin</url>
     
     <properties>
-        <jenkins-core.version>2.58-20170502.192524-8</jenkins-core.version> <!-- TODO: Switch to release once https://github.com/jenkinsci/jenkins/pull/2730 is merged and released -->
-        <jenkins-war.version>2.58-20170502.192544-8</jenkins-war.version> <!-- TODO: Switch to release once https://github.com/jenkinsci/jenkins/pull/2730 is merged and released -->
+      <jenkins.version>2.60</jenkins.version>
       <no-test-jar>false</no-test-jar>  
       <scm-api-plugin.version>2.1.0</scm-api-plugin.version>
     </properties>

From 99845bef9b8afb7be954de0ad7ad97b2b5ebf250 Mon Sep 17 00:00:00 2001
From: Andrew Bayer <andrew.bayer@gmail.com>
Date: Thu, 18 May 2017 14:17:06 -0400
Subject: [PATCH 4/5] Reverting to 1.642.3 baseline

---
 pom.xml                                                  | 2 +-
 src/main/java/hudson/plugins/mercurial/MercurialSCM.java | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c3bf521b..5eeef2cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <url>http://wiki.jenkins-ci.org/display/JENKINS/Mercurial+Plugin</url>
     
     <properties>
-      <jenkins.version>2.60</jenkins.version>
+      <jenkins.version>1.642.3</jenkins.version>
       <no-test-jar>false</no-test-jar>  
       <scm-api-plugin.version>2.1.0</scm-api-plugin.version>
     </properties>
diff --git a/src/main/java/hudson/plugins/mercurial/MercurialSCM.java b/src/main/java/hudson/plugins/mercurial/MercurialSCM.java
index 35181308..10739b65 100755
--- a/src/main/java/hudson/plugins/mercurial/MercurialSCM.java
+++ b/src/main/java/hudson/plugins/mercurial/MercurialSCM.java
@@ -881,6 +881,10 @@ private void clone(Run<?, ?> build, Launcher launcher, FilePath repository, Node
     }
 
     @Override
+    public void buildEnvVars(AbstractBuild<?,?> build, Map<String,String> env) {
+        buildEnvironment(build, env);
+    }
+
     public void buildEnvironment(Run<?,?> build, Map<String, String> env) {
         buildEnvVarsFromActionable(build, env);
     }

From 67a658123df20cdd4592216e06a53e7c34b634dd Mon Sep 17 00:00:00 2001
From: Andrew Bayer <andrew.bayer@gmail.com>
Date: Fri, 19 May 2017 11:45:05 -0400
Subject: [PATCH 5/5] Add TODOs

---
 src/main/java/hudson/plugins/mercurial/MercurialSCM.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/hudson/plugins/mercurial/MercurialSCM.java b/src/main/java/hudson/plugins/mercurial/MercurialSCM.java
index 10739b65..da658d0b 100755
--- a/src/main/java/hudson/plugins/mercurial/MercurialSCM.java
+++ b/src/main/java/hudson/plugins/mercurial/MercurialSCM.java
@@ -880,11 +880,13 @@ 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) {
         buildEnvironment(build, env);
     }
 
+    // TODO: 2.60+ - add @Override.
     public void buildEnvironment(Run<?,?> build, Map<String, String> env) {
         buildEnvVarsFromActionable(build, env);
     }