From 3f0a3eac85a8d3783b514e456615c3395629dc01 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 12 Jun 2017 19:55:17 -0400
Subject: [PATCH 1/4] [JENKINS-41631] Running requireUpperBoundDeps.

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

diff --git a/pom.xml b/pom.xml
index 3e1b003c6f..39a2a7eda4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
     <!-- Should only need to override these if using timestamped snapshots: -->
     <jenkins-core.version>${jenkins.version}</jenkins-core.version>
     <jenkins-war.version>${jenkins.version}</jenkins-war.version>
-    <jenkins-test-harness.version>2.22</jenkins-test-harness.version>
+    <jenkins-test-harness.version>2.23-20170612.232140-1</jenkins-test-harness.version> <!-- TODO https://github.com/jenkinsci/jenkins-test-harness/pull/62 -->
     <hpi-plugin.version>2.0</hpi-plugin.version>
     <stapler-plugin.version>1.17</stapler-plugin.version>
     <java.level>7</java.level>
@@ -321,7 +321,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>1.4.1</version>
+          <version>1.4.2-20170612.231258-1</version> <!-- TODO https://github.com/apache/maven-enforcer/pull/23 -->
         </plugin>
         <plugin>
           <artifactId>maven-install-plugin</artifactId>
@@ -526,6 +526,13 @@
                   <message>No Snapshots Allowed For Release Versions</message>
                   <onlyWhenRelease>true</onlyWhenRelease>
                 </requireReleaseDeps>
+                <requireUpperBoundDeps>
+                  <excludes>
+                    <exclude>com.google.guava:guava</exclude> <!-- TODO Stapler requests 14 while Jenkins requests 11; should backdate the Stapler version -->
+                    <exclude>commons-logging:commons-logging</exclude> <!-- TODO jenkins-test-harness-htmlunit requests 1.2, newer than 1.1.x in core -->
+                    <exclude>com.google.code.findbugs:jsr305</exclude> <!-- Stapler requests 2.x while core requests 1.x; anyway not used at runtime -->
+                  </excludes>
+                </requireUpperBoundDeps>
               </rules>
             </configuration>
           </execution>

From e33357d59944fc508abdc659292f7ac39e139599 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Tue, 13 Jun 2017 15:07:56 -0400
Subject: [PATCH 2/4] Also ignore org.kohsuke:access-modifier-annotation.

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

diff --git a/pom.xml b/pom.xml
index cd00bbf7fb..36afb34d24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -531,6 +531,7 @@
                     <exclude>com.google.guava:guava</exclude> <!-- TODO Stapler requests 14 while Jenkins requests 11; should backdate the Stapler version -->
                     <exclude>commons-logging:commons-logging</exclude> <!-- TODO jenkins-test-harness-htmlunit requests 1.2, newer than 1.1.x in core -->
                     <exclude>com.google.code.findbugs:jsr305</exclude> <!-- Stapler requests 2.x while core requests 1.x; anyway not used at runtime -->
+                    <exclude>org.kohsuke:access-modifier-annotation</exclude> <!-- needed between Jenkins 2.36—2.60 -->
                   </excludes>
                 </requireUpperBoundDeps>
               </rules>

From 74f4f580aa708f1e58bb5e752254026996902591 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 26 Jun 2017 16:34:45 -0400
Subject: [PATCH 3/4] Using private build of 1.4.2.jenkins-1 to pick up
 MENFORCER-273 which was merged but not yet released. git checkout
 bd11bcad2ea7d5ff2713be4dbcc2cbbf745a552c # enforcer-1.4.2 prepared but not
 tagged? mvn versions:set -DnewVersion=1.4.2.jenkins-1 mvn
 -Papache-release,run-its clean deploy
 -DaltDeploymentRepository=maven.jenkins-ci.org::default::https://repo.jenkins-ci.org/releases/

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

diff --git a/pom.xml b/pom.xml
index 36afb34d24..53aff9d882 100644
--- a/pom.xml
+++ b/pom.xml
@@ -321,7 +321,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>1.4.2-20170612.231258-1</version> <!-- TODO https://github.com/apache/maven-enforcer/pull/23 -->
+          <version>1.4.2.jenkins-1</version> <!-- TODO update to official 1.4.2 or 3.0.0 when available -->
         </plugin>
         <plugin>
           <artifactId>maven-install-plugin</artifactId>

From ae29971cb0a1e8d5b1254b5dddb2435f897b11ef Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 26 Jun 2017 16:54:08 -0400
Subject: [PATCH 4/4] jenkins-test-harness 2.23

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

diff --git a/pom.xml b/pom.xml
index 53aff9d882..df7575e241 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
     <!-- Should only need to override these if using timestamped snapshots: -->
     <jenkins-core.version>${jenkins.version}</jenkins-core.version>
     <jenkins-war.version>${jenkins.version}</jenkins-war.version>
-    <jenkins-test-harness.version>2.23-20170612.232140-1</jenkins-test-harness.version> <!-- TODO https://github.com/jenkinsci/jenkins-test-harness/pull/62 -->
+    <jenkins-test-harness.version>2.23</jenkins-test-harness.version>
     <hpi-plugin.version>2.0</hpi-plugin.version>
     <stapler-plugin.version>1.17</stapler-plugin.version>
     <java.level>7</java.level>