From 19bde0acee606ad84a37c41edf2ba85c1ec929b8 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Fri, 1 Nov 2024 13:36:58 -0600
Subject: [PATCH] Use same version in BOM as is declared for plugin (#1114)

Previously the plugin required Jenkins 2.452.4 but only used plugin BOM
dependencies from 2.440.x.

Also removes the unnecessary declaration of the httpcomponents-client-5
plugin version since the plugin BOM now includes the correct version.

Confirmed that `mvn dependency:tree` reports the same version of
httpcomponents-client-5 plugin from the plugin BOM as is currently
delivered to users.
---
 pom.xml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 779c905f..3f90594e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,8 @@
   <properties>
     <revision>1.7.1</revision>
     <changelist>-SNAPSHOT</changelist>
-    <jenkins.version>2.452.4</jenkins.version>
+    <jenkins.baseline>2.452</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.4</jenkins.version>
     <gitHubRepo>jenkinsci/docker-plugin</gitHubRepo>
     <!-- Our unit-tests that talk to a real docker deamon aren't very stable -->
     <surefire.rerunFailingTestsCount>3</surefire.rerunFailingTestsCount>
@@ -76,8 +77,8 @@
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.440.x</artifactId>
-        <version>3435.v238d66a_043fb_</version>
+        <artifactId>bom-${jenkins.baseline}.x</artifactId>
+        <version>3613.v584fca_12cf5c</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -162,13 +163,9 @@
       <artifactId>test-harness</artifactId>
       <scope>test</scope>
     </dependency>
-    <!-- tests fail with newer httpcomponents-client-5 -->
-    <!-- httpcomponents-client-5 5.4-118.v199115451c4d shows the failure -->
-    <!-- https://github.com/jenkinsci/docker-plugin/issues/1103 -->
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>apache-httpcomponents-client-5-api</artifactId>
-      <version>5.3.1-110.v77252fb_d4da_5</version>
       <scope>test</scope>
     </dependency>
     <dependency>