From 0af3d46db005d873c104f1ae1743749d7c13e7c5 Mon Sep 17 00:00:00 2001
From: Devin Nusbaum <d.w.nusbaum@gmail.com>
Date: Fri, 5 Oct 2018 12:36:23 -0400
Subject: [PATCH 1/4] Pick up jenkinsci/jenkins-test-harness#113 to shorten
 file names on Windows

---
 pom.xml                                                        | 1 +
 .../org/jenkinsci/plugins/workflow/libs/SCMRetrieverTest.java  | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 72337258..0533d4ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,6 +71,7 @@
         <scm-api-plugin.version>2.2.5</scm-api-plugin.version>
         <workflow-scm-step-plugin.version>2.4</workflow-scm-step-plugin.version>
         <workflow-multibranch-plugin.version>2.10</workflow-multibranch-plugin.version>
+        <jenkins-test-harness.version>2.44-20181005.160621-2</jenkins-test-harness.version> <!-- TODO https://github.com/jenkinsci/jenkins-test-harness/pull/113 -->
     </properties>
     <dependencies>
         <dependency>
diff --git a/src/test/java/org/jenkinsci/plugins/workflow/libs/SCMRetrieverTest.java b/src/test/java/org/jenkinsci/plugins/workflow/libs/SCMRetrieverTest.java
index c3875767..e4f0cf87 100644
--- a/src/test/java/org/jenkinsci/plugins/workflow/libs/SCMRetrieverTest.java
+++ b/src/test/java/org/jenkinsci/plugins/workflow/libs/SCMRetrieverTest.java
@@ -24,7 +24,6 @@
 
 package org.jenkinsci.plugins.workflow.libs;
 
-import hudson.Functions;
 import java.util.Collections;
 import jenkins.branch.BranchSource;
 import jenkins.plugins.git.GitSCMSource;
@@ -35,7 +34,6 @@
 import org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject;
 import org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProjectTest;
 import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep;
-import org.junit.Assume;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.Rule;
@@ -51,7 +49,6 @@ public class SCMRetrieverTest {
 
     @Url("https://stackoverflow.com/a/49112612/12916")
     @Test public void selfTestLibraries() throws Exception {
-        Assume.assumeFalse("File names are too long for Windows", Functions.isWindows()); // Related to changes in plugin-pom version 3.22.
         sampleRepo.init();
         sampleRepo.write("vars/greet.groovy", "def call(recipient) {echo(/hello to $recipient/)}");
         sampleRepo.write("src/pkg/Clazz.groovy", "package pkg; class Clazz {static String whereAmI() {'earth'}}");

From 09803accc253d38aa4282d7c2f93a2580ee1ac2b Mon Sep 17 00:00:00 2001
From: Devin Nusbaum <d.w.nusbaum@gmail.com>
Date: Fri, 5 Oct 2018 13:50:51 -0400
Subject: [PATCH 2/4] Pick up
 https://github.com/jenkinsci/branch-api-plugin/pull/129 to try to shorten
 paths

---
 pom.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0533d4ab..d117f981 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,11 +64,11 @@
     <properties>
         <revision>2.13</revision>
         <changelist>-SNAPSHOT</changelist>
-        <jenkins.version>2.73.3</jenkins.version>
+        <jenkins.version>2.107.3</jenkins.version>
         <java.level>8</java.level>
         <workflow-cps-plugin.version>2.57</workflow-cps-plugin.version>
         <git-plugin.version>3.6.4</git-plugin.version>
-        <scm-api-plugin.version>2.2.5</scm-api-plugin.version>
+        <scm-api-plugin.version>2.2.7</scm-api-plugin.version>
         <workflow-scm-step-plugin.version>2.4</workflow-scm-step-plugin.version>
         <workflow-multibranch-plugin.version>2.10</workflow-multibranch-plugin.version>
         <jenkins-test-harness.version>2.44-20181005.160621-2</jenkins-test-harness.version> <!-- TODO https://github.com/jenkinsci/jenkins-test-harness/pull/113 -->
@@ -103,7 +103,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>cloudbees-folder</artifactId>
-            <version>5.16</version>
+            <version>6.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -257,6 +257,12 @@
             <version>1.20</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>branch-api</artifactId>
+            <version>2.0.21-rc630.81000cf36de3</version> <!-- TODO https://github.com/jenkinsci/branch-api-plugin/pull/129 -->
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

From ca4aab6583c3ae0c71fdd3715c9c8ec0953ad3e7 Mon Sep 17 00:00:00 2001
From: Devin Nusbaum <d.w.nusbaum@gmail.com>
Date: Fri, 5 Oct 2018 15:10:38 -0400
Subject: [PATCH 3/4] Update parent pom

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

diff --git a/pom.xml b/pom.xml
index d117f981..aa3d2966 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>3.24</version>
+        <version>3.25</version>
         <relativePath />
     </parent>
     <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -71,7 +71,6 @@
         <scm-api-plugin.version>2.2.7</scm-api-plugin.version>
         <workflow-scm-step-plugin.version>2.4</workflow-scm-step-plugin.version>
         <workflow-multibranch-plugin.version>2.10</workflow-multibranch-plugin.version>
-        <jenkins-test-harness.version>2.44-20181005.160621-2</jenkins-test-harness.version> <!-- TODO https://github.com/jenkinsci/jenkins-test-harness/pull/113 -->
     </properties>
     <dependencies>
         <dependency>

From c039bdcc09f4efc6b0f83800c3862ad21c6cb233 Mon Sep 17 00:00:00 2001
From: Devin Nusbaum <d.w.nusbaum@gmail.com>
Date: Fri, 9 Nov 2018 15:03:58 -0500
Subject: [PATCH 4/4] Update to released version of branch-api

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index aa3d2966..3d6432da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>3.25</version>
+        <version>3.28</version>
         <relativePath />
     </parent>
     <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -259,7 +259,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>branch-api</artifactId>
-            <version>2.0.21-rc630.81000cf36de3</version> <!-- TODO https://github.com/jenkinsci/branch-api-plugin/pull/129 -->
+            <version>2.0.21</version>
             <scope>test</scope>
         </dependency>
     </dependencies>