Bump io.jenkins.tools.bom:bom-2.440.x from 3307.v2769886db_63b_ to 34…

…13.v0d896b_76a_30d (#1102)
jenkinsci · Oct 1, 2024 · d5453c5 · d5453c5
1 parent 2c4c808
commit d5453c5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -77,7 +77,7 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-2.440.x</artifactId>
-        <version>3307.v2769886db_63b_</version>
+        <version>3413.v0d896b_76a_30d</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -162,6 +162,15 @@
       <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>
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
       <artifactId>workflow-support</artifactId>

diff --git a/src/test/java/com/nirima/jenkins/plugins/docker/DockerCloudTest.java b/src/test/java/com/nirima/jenkins/plugins/docker/DockerCloudTest.java
@@ -14,7 +14,6 @@
 import hudson.util.Secret;
 import io.jenkins.docker.client.DockerAPI;
 import io.jenkins.docker.connector.DockerComputerAttachConnector;
-import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -187,7 +186,7 @@ private static void assertCount(
     }
 
     @Test
-    public void testRegistryCredentials() throws IOException {
+    public void testRegistryCredentials() throws Exception {
 
         final CredentialsStore store = CredentialsProvider.lookupStores(jenkins.getInstance())
                 .iterator()